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

Update only Third Party git submodules that are used

Browse Source
This commit is contained in:
Gaute Lindkvist 2020-05-29 12:47:05 +02:00
parent d19d44081c
commit 77090bce6a
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
CMakeLists.txt
View File

@ -168,6 +168,14 @@ endif(RESINSIGHT_ERT_EXTERNAL_LIB_ROOT OR RESINSIGHT_ERT_EXTERNAL_INCLUDE_ROOT)
# restore buildcache when libecl has been configured # restore buildcache when libecl has been configured
set(CMAKE_CXX_COMPILER_LAUNCHER ${TEMP_CMAKE_CXX_COMPILER_LAUNCHER}) set(CMAKE_CXX_COMPILER_LAUNCHER ${TEMP_CMAKE_CXX_COMPILER_LAUNCHER})
######################################
# Go through required git submodules #
######################################
list(APPEND THIRD_PARTY_SUBMODULES qwt)
option(GSL_ENABLE "Enable the GNU Scientific Library for Statistics" OFF)
if(GSL_ENABLE)
list(APPEND THIRD_PARTY_SUBMODULES gsl)
endif(GSL_ENABLE)
############################################### ###############################################
# Init GIT submodules if they haven't already # # Init GIT submodules if they haven't already #
############################################### ###############################################
@ -176,14 +184,16 @@ if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git")
# Update submodules as needed # Update submodules as needed
option(GIT_SUBMODULE "Check submodules during build" ON) option(GIT_SUBMODULE "Check submodules during build" ON)
if(GIT_SUBMODULE) if(GIT_SUBMODULE)
set (SUBDIR "${PROJECT_SOURCE_DIR}/ThirdParty/${SUBMODULE}") foreach (SUBMODULE ${THIRD_PARTY_SUBMODULES})
message(STATUS "Initializing GIT submodules") set (SUBDIR "${PROJECT_SOURCE_DIR}/ThirdParty/${SUBMODULE}")
execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive message(STATUS "Initializing GIT submodules")
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive -- ${SUBDIR}
RESULT_VARIABLE GIT_SUBMOD_RESULT) WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
if(NOT GIT_SUBMOD_RESULT EQUAL "0") RESULT_VARIABLE GIT_SUBMOD_RESULT)
message(FATAL_ERROR "git submodule update --init failed with ${GIT_SUBMOD_RESULT}, please checkout submodules") if(NOT GIT_SUBMOD_RESULT EQUAL "0")
endif() message(FATAL_ERROR "git submodule update --init failed for ${SUBMODULE} with ${GIT_SUBMOD_RESULT}, please checkout submodules")
endif()
endforeach()
endif() endif()
endif() endif()
@ -317,7 +327,6 @@ list(APPEND THIRD_PARTY_LIBRARIES
qwt qwt
) )
################################################################################ ################################################################################
# Nightcharts # Nightcharts
################################################################################ ################################################################################
@ -359,7 +368,6 @@ set_property(TARGET
################################################################################ ################################################################################
# GNU GSL # GNU GSL
################################################################################ ################################################################################
option(GSL_ENABLE "Enable the GNU Scientific Library for Statistics" OFF) option(GSL_ENABLE "Enable the GNU Scientific Library for Statistics" OFF)
if(GSL_ENABLE) if(GSL_ENABLE)
if (NOT EXISTS "${PROJECT_SOURCE_DIR}/ThirdParty/gsl/CMakeLists.txt") if (NOT EXISTS "${PROJECT_SOURCE_DIR}/ThirdParty/gsl/CMakeLists.txt")
@ -369,7 +377,7 @@ if(GSL_ENABLE)
add_subdirectory(ThirdParty/gsl) add_subdirectory(ThirdParty/gsl)
add_definitions(-DUSE_GSL) add_definitions(-DUSE_GSL)
list(APPEND THIRD_PARTY_LIBRARIES gsl) list(APPEND THIRD_PARTY_LIBRARIES gsl)
# set this property manually for all GSL projects, as they are put into a separate folder # set this property manually for all GSL projects, as they are put into a separate folder
set_property(TARGET set_property(TARGET
gsl gsl