Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
O
ogs
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
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
Dmitri Naumov
ogs
Commits
b0a83173
Commit
b0a83173
authored
12 years ago
by
Norihiro Watanabe
Browse files
Options
Downloads
Patches
Plain Diff
add USE_LIS option and FindLis
parent
5e9332ba
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMakeLists.txt
+3
-0
3 additions, 0 deletions
CMakeLists.txt
scripts/cmake/Find.cmake
+9
-0
9 additions, 0 deletions
scripts/cmake/Find.cmake
scripts/cmake/cmake/FindLIS.cmake
+48
-0
48 additions, 0 deletions
scripts/cmake/cmake/FindLIS.cmake
with
60 additions
and
0 deletions
CMakeLists.txt
+
3
−
0
View file @
b0a83173
...
@@ -55,6 +55,9 @@ OPTION(OGS_BUILD_UTILS "Should the utilities programms be built?" OFF)
...
@@ -55,6 +55,9 @@ OPTION(OGS_BUILD_UTILS "Should the utilities programms be built?" OFF)
OPTION
(
OGS_NO_EXTERNAL_LIBS
"Builds OGS without any external dependencies."
OFF
)
OPTION
(
OGS_NO_EXTERNAL_LIBS
"Builds OGS without any external dependencies."
OFF
)
# Linear solvers
OPTION
(
OGS_USE_LIS
"Use Lis"
OFF
)
# Logging
# Logging
OPTION
(
OGS_DISABLE_LOGGING
"Disables all logog messages."
OFF
)
OPTION
(
OGS_DISABLE_LOGGING
"Disables all logog messages."
OFF
)
...
...
This diff is collapsed.
Click to expand it.
scripts/cmake/Find.cmake
+
9
−
0
View file @
b0a83173
...
@@ -138,6 +138,15 @@ IF(Shapelib_FOUND)
...
@@ -138,6 +138,15 @@ IF(Shapelib_FOUND)
ADD_DEFINITIONS
(
-DShapelib_FOUND
)
ADD_DEFINITIONS
(
-DShapelib_FOUND
)
ENDIF
()
# Shapelib_FOUND
ENDIF
()
# Shapelib_FOUND
## lis ##
IF
(
OGS_USE_LIS
)
FIND_PACKAGE
(
LIS REQUIRED
)
IF
(
LIS_FOUND
)
INCLUDE_DIRECTORIES
(
${
LIS_INCLUDE_DIR
}
)
ADD_DEFINITIONS
(
-DUSE_LIS
)
ENDIF
()
ENDIF
()
########################
########################
### Find other stuff ###
### Find other stuff ###
########################
########################
...
...
This diff is collapsed.
Click to expand it.
scripts/cmake/cmake/FindLIS.cmake
0 → 100644
+
48
−
0
View file @
b0a83173
# - Try to find LIS
# Once done, this will define
#
# LIS_FOUND
# LIS_INCLUDE_DIRS
# LIS_LIBRARIES
if
(
NOT LIS_FOUND
)
include
(
LibFindMacros
)
find_path
(
LIS_INCLUDE_DIR
NAMES lis.h
PATHS
${
CMAKE_SOURCE_DIR
}
/../Libs/precompiled
)
if
(
UNIX
)
# Tell if the unix system is on 64-bit base
if
(
CMAKE_SIZEOF_VOID_P MATCHES
"8"
)
find_library
(
LIS_LIBRARIES
NAMES lis-64
PATHS
${
CMAKE_SOURCE_DIR
}
/../Libs/precompiled
)
else
(
CMAKE_SIZEOF_VOID_P MATCHES
"8"
)
find_library
(
LIS_LIBRARIES
NAMES lis-32
PATHS
${
CMAKE_SOURCE_DIR
}
/../Libs/precompiled
)
endif
(
CMAKE_SIZEOF_VOID_P MATCHES
"8"
)
else
(
UNIX
)
find_library
(
LIS_LIBRARIES
NAMES lisomp
PATHS
${
CMAKE_SOURCE_DIR
}
/../Libs/precompiled
)
endif
(
UNIX
)
# Set the include dir variables and the libraries and let libfind_process do the rest.
# NOTE: Singular variables for this library, plural for libraries this this lib depends on.
if
(
NOT LIS_LIBRARIES STREQUAL
"LIS_LIBRARIES-NOTFOUND"
AND NOT LIS_INCLUDE_DIR STREQUAL
"LIS_INCLUDE_DIR-NOTFOUND"
)
set
(
LIS_PROCESS_INCLUDES LIS_INCLUDE_DIR
)
set
(
LIS_PROCESS_LIBS LIS_LIBRARIES
)
libfind_process
(
LIS
)
else
(
NOT LIS_LIBRARIES STREQUAL
"LIS_LIBRARIES-NOTFOUND"
AND NOT LIS_INCLUDE_DIR STREQUAL
"LIS_INCLUDE_DIR-NOTFOUND"
)
message
(
STATUS
"Warning: LIS not found!"
)
endif
(
NOT LIS_LIBRARIES STREQUAL
"LIS_LIBRARIES-NOTFOUND"
AND NOT LIS_INCLUDE_DIR STREQUAL
"LIS_INCLUDE_DIR-NOTFOUND"
)
endif
(
NOT LIS_FOUND
)
if
(
LIS_FOUND
)
INCLUDE_DIRECTORIES
(
${
LIS_INCLUDE_DIR
}
)
message
(
STATUS
"LIS found (include:
${
LIS_INCLUDE_DIR
}
)"
)
endif
(
LIS_FOUND
)
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