OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Change to use ampl/gsl rather than lindkvis/gsl

Browse Source
This commit is contained in:
Gaute Lindkvist
2020-04-22 17:07:56 +02:00
parent 9fcfe4fa84
commit 5d469e6bef
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@@ -3,4 +3,4 @@
url = https://github.com/microsoft/vcpkg url = https://github.com/microsoft/vcpkg
[submodule "ThirdParty/gsl"] [submodule "ThirdParty/gsl"]
path = ThirdParty/gsl path = ThirdParty/gsl
url = https://github.com/lindkvis/gsl/ url = https://github.com/ampl/gsl/

14
ThirdParty/Qwt/src/CMakeLists.txt vendored
View File

@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8.12) cmake_minimum_required(VERSION 3.6.2)
project(Qwt) project(Qwt)
@@ -274,15 +274,9 @@ qwt_thermo.h
qwt_wheel.h qwt_wheel.h
) )
if (RESINSIGHT_BUILD_WITH_QT5) find_package(Qt5 COMPONENTS REQUIRED Concurrent Core Gui OpenGL PrintSupport Widgets)
find_package(Qt5 COMPONENTS REQUIRED Concurrent Core Gui OpenGL PrintSupport Widgets) set(QT_LIBRARIES Qt5::Concurrent Qt5::Core Qt5::Gui Qt5::OpenGL Qt5::PrintSupport Qt5::Widgets)
set(QT_LIBRARIES Qt5::Concurrent Qt5::Core Qt5::Gui Qt5::OpenGL Qt5::PrintSupport Qt5::Widgets) qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES})
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES})
else()
find_package(Qt4 COMPONENTS QtCore QtGui QtMain QtOpenGl REQUIRED)
include(${QT_USE_FILE})
qt4_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES})
endif(RESINSIGHT_BUILD_WITH_QT5)
add_library(${PROJECT_NAME} ${HEADER_FILES} ${SOURCE_FILES} ${MOC_SOURCE_FILES}) add_library(${PROJECT_NAME} ${HEADER_FILES} ${SOURCE_FILES} ${MOC_SOURCE_FILES})