Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
D
dynamic
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
MostafaMollaali
dynamic
Commits
86776cc2
Commit
86776cc2
authored
12 years ago
by
Lars Bilke
Browse files
Options
Downloads
Patches
Plain Diff
OGS_NO_EXTERNAL_LIBS only omits searching for libraries now.
Before also necessary tools were not searched for.
parent
6c8a6fb2
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+1
-3
1 addition, 3 deletions
CMakeLists.txt
scripts/cmake/Find.cmake
+16
-10
16 additions, 10 deletions
scripts/cmake/Find.cmake
with
17 additions
and
13 deletions
CMakeLists.txt
+
1
−
3
View file @
86776cc2
...
@@ -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
)
...
...
This diff is collapsed.
Click to expand it.
scripts/cmake/Find.cmake
+
16
−
10
View file @
86776cc2
...
@@ -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
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment