Skip to content
Snippets Groups Projects
Commit 86776cc2 authored by Lars Bilke's avatar Lars Bilke
Browse files

OGS_NO_EXTERNAL_LIBS only omits searching for libraries now.

Before also necessary tools were not searched for.
parent 6c8a6fb2
No related branches found
No related tags found
No related merge requests found
...@@ -25,9 +25,7 @@ INCLUDE(scripts/cmake/FindIncludeHeader.cmake) ...@@ -25,9 +25,7 @@ INCLUDE(scripts/cmake/FindIncludeHeader.cmake)
INCLUDE(scripts/cmake/Functions.cmake) INCLUDE(scripts/cmake/Functions.cmake)
INCLUDE(scripts/cmake/CMakeSetup.cmake) INCLUDE(scripts/cmake/CMakeSetup.cmake)
INCLUDE(scripts/cmake/CompilerSetup.cmake) INCLUDE(scripts/cmake/CompilerSetup.cmake)
IF(NOT OGS_NO_EXTERNAL_LIBS) INCLUDE(scripts/cmake/Find.cmake)
INCLUDE(scripts/cmake/Find.cmake)
ENDIF() # NOT OGS_NO_EXTERNAL_LIBS
INCLUDE(scripts/cmake/SubmoduleSetup.cmake) INCLUDE(scripts/cmake/SubmoduleSetup.cmake)
INCLUDE(scripts/cmake/ProjectSetup.cmake) INCLUDE(scripts/cmake/ProjectSetup.cmake)
INCLUDE(scripts/cmake/DocumentationSetup.cmake) INCLUDE(scripts/cmake/DocumentationSetup.cmake)
......
...@@ -42,10 +42,26 @@ IF(WIN32 AND OGS_PACKAGING) ...@@ -42,10 +42,26 @@ IF(WIN32 AND OGS_PACKAGING)
MESSAGE(FATAL_ERROR "Dumpbin was not found but is required for packaging!") MESSAGE(FATAL_ERROR "Dumpbin was not found but is required for packaging!")
ENDIF() ENDIF()
ENDIF() ENDIF()
########################
### Find other stuff ###
########################
# Check if on Jenkins
IF(NOT $ENV{JENKINS_URL} STREQUAL "")
SET(JENKINS_URL $ENV{JENKINS_URL})
SET(JENKINS_JOB_NAME $ENV{JOB_NAME})
ENDIF()
###################### ######################
### Find libraries ### ### Find libraries ###
###################### ######################
# Do not search for libs if this option is set
IF(OGS_NO_EXTERNAL_LIBS)
RETURN()
ENDIF() # OGS_NO_EXTERNAL_LIBS
# Clang does not have OpenMP support atm, see https://github.com/ufz/ogs/issues/8 # Clang does not have OpenMP support atm, see https://github.com/ufz/ogs/issues/8
IF(NOT COMPILER_IS_CLANG) IF(NOT COMPILER_IS_CLANG)
FIND_PACKAGE(OpenMP) FIND_PACKAGE(OpenMP)
...@@ -142,13 +158,3 @@ ENDIF() # Shapelib_FOUND ...@@ -142,13 +158,3 @@ ENDIF() # Shapelib_FOUND
IF(OGS_USE_LIS) IF(OGS_USE_LIS)
FIND_PACKAGE( LIS REQUIRED ) FIND_PACKAGE( LIS REQUIRED )
ENDIF() ENDIF()
########################
### Find other stuff ###
########################
# Check if on Jenkins
IF(NOT $ENV{JENKINS_URL} STREQUAL "")
SET(JENKINS_URL $ENV{JENKINS_URL})
SET(JENKINS_JOB_NAME $ENV{JOB_NAME})
ENDIF()
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment