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
17696834
Commit
17696834
authored
11 years ago
by
Lars Bilke
Browse files
Options
Downloads
Patches
Plain Diff
Download Eigen into the build dir if it is not found on the system.
parent
e53f2e44
No related branches found
Branches containing commit
No related tags found
Tags containing commit
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/ExternalProjectEigen.cmake
+35
-0
35 additions, 0 deletions
scripts/cmake/ExternalProjectEigen.cmake
scripts/cmake/Find.cmake
+0
-5
0 additions, 5 deletions
scripts/cmake/Find.cmake
with
38 additions
and
5 deletions
CMakeLists.txt
+
3
−
0
View file @
17696834
...
@@ -98,6 +98,9 @@ ENDIF() #OGS_PACKAGING
...
@@ -98,6 +98,9 @@ ENDIF() #OGS_PACKAGING
OPTION
(
Boost_USE_STATIC_LIBS
"This option has to be set from the command line (before boost gets found)!"
OFF
)
OPTION
(
Boost_USE_STATIC_LIBS
"This option has to be set from the command line (before boost gets found)!"
OFF
)
INCLUDE
(
scripts/cmake/ExternalProjectBoost.cmake
)
INCLUDE
(
scripts/cmake/ExternalProjectBoost.cmake
)
INCLUDE_DIRECTORIES
(
${
Boost_INCLUDE_DIRS
}
)
INCLUDE_DIRECTORIES
(
${
Boost_INCLUDE_DIRS
}
)
IF
(
OGS_USE_EIGEN
)
INCLUDE
(
scripts/cmake/ExternalProjectEigen.cmake
)
ENDIF
()
# Add subdirectories with the projects
# Add subdirectories with the projects
ADD_SUBDIRECTORY
(
ThirdParty
)
ADD_SUBDIRECTORY
(
ThirdParty
)
...
...
This diff is collapsed.
Click to expand it.
scripts/cmake/ExternalProjectEigen.cmake
0 → 100644
+
35
−
0
View file @
17696834
MESSAGE
(
STATUS
"Eigen inc:
${
EIGEN3_INCLUDE_DIR
}
"
)
IF
(
EIGEN3_FOUND
)
RETURN
()
ENDIF
()
# First check for system Eigen
IF
(
NOT EIGEN3_INCLUDE_DIR
)
FIND_PACKAGE
(
Eigen3
)
IF
(
EIGEN3_FOUND
)
SET
(
EIGEN3_FOUND TRUE CACHE BOOL
"Was Eigen found?"
FORCE
)
SET
(
EIGEN3_INCLUDE_DIR
"
${
EIGEN3_INCLUDE_DIR
}
"
CACHE STRING
"Eigen include dir"
FORCE
)
RETURN
()
ELSE
()
SET
(
EIGEN3_INCLUDE_DIR
""
)
ENDIF
()
ENDIF
()
ExternalProject_Add
(
Eigen
PREFIX
${
CMAKE_BINARY_DIR
}
/External/eigen
URL http://bitbucket.org/eigen/eigen/get/3.2.0.tar.gz
URL_MD5 9559c34af203dde5f3f1d976d859c5b3
UPDATE_COMMAND
""
CONFIGURE_COMMAND
""
BUILD_COMMAND
""
BUILD_IN_SOURCE 1
INSTALL_COMMAND
""
)
ExternalProject_Get_Property
(
Eigen source_dir
)
IF
(
NOT EIGEN3_INCLUDE_DIR
)
SET
(
EIGEN3_FOUND TRUE CACHE BOOL
"Was Eigen found?"
FORCE
)
SET
(
EIGEN3_INCLUDE_DIR
${
source_dir
}
CACHE INTERNAL
"Eigen include dir"
)
MESSAGE
(
STATUS
"Downloading Eigen automatically."
)
ENDIF
()
This diff is collapsed.
Click to expand it.
scripts/cmake/Find.cmake
+
0
−
5
View file @
17696834
...
@@ -165,8 +165,3 @@ ENDIF() # Shapelib_FOUND
...
@@ -165,8 +165,3 @@ ENDIF() # Shapelib_FOUND
IF
(
OGS_USE_LIS
)
IF
(
OGS_USE_LIS
)
FIND_PACKAGE
(
LIS REQUIRED
)
FIND_PACKAGE
(
LIS REQUIRED
)
ENDIF
()
ENDIF
()
## Eigen ##
IF
(
OGS_USE_EIGEN
)
FIND_PACKAGE
(
Eigen3 REQUIRED
)
ENDIF
()
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