diff options
| author |  Hans Johnson <hans.j.johnson@gmail.com> | 2019-11-17 15:14:25 -0600 |
|---|---|---|
| committer | Hans Johnson <hans.j.johnson@gmail.com> | 2019-11-17 15:14:25 -0600 |
| commit | e78ed6e7f3d64f06761446d0a8dcb356a0373bff (patch) | |
| tree | 13a446c077ed5477cc2a619ceac69b91c8e1f464 | |
| parent | 9d5cdc98c3300662c112dd28a1c2a67c0389168d (diff) | |
COMP: Simplify install commands for Eigen
Confirm that install directory is identical
before and after this simplifying patch.
```bash
hg clone <<Eigen>>
mkdir eigen-bld
cd eigen-bld
cmake ../Eigen -DCMAKE_INSTALL_PREFIX:PATH=/tmp/bef
make install
find /tmp/pre_eigen_modernize >/tmp/bef
# Apply this patch
cmake ../Eigen -DCMAKE_INSTALL_PREFIX:PATH=/tmp/aft
make install
find /tmp/post_eigen_modernize |sed 's/post_e/pre_e/g' >/tmp/aft
diff /tmp/bef /tmp/aft
```
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Eigen/CMakeLists.txt | 19 |
2 files changed, 1 insertions, 20 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4c178ce56..619bd18f8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -456,7 +456,7 @@ if(EIGEN_BUILD_PKGCONFIG) ) endif() -add_subdirectory(Eigen) +install(DIRECTORY Eigen DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel) add_subdirectory(doc EXCLUDE_FROM_ALL) diff --git a/Eigen/CMakeLists.txt b/Eigen/CMakeLists.txt deleted file mode 100644 index 8236684a2..000000000 --- a/Eigen/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -include(RegexUtils) -test_escape_string_as_regex() - -file(GLOB Eigen_directory_files "*") - -escape_string_as_regex(ESCAPED_CMAKE_CURRENT_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}") - -foreach(f ${Eigen_directory_files}) - if(NOT f MATCHES "\\.txt" AND NOT f MATCHES "${ESCAPED_CMAKE_CURRENT_SOURCE_DIR}/[.].+" AND NOT f MATCHES "${ESCAPED_CMAKE_CURRENT_SOURCE_DIR}/src") - list(APPEND Eigen_directory_files_to_install ${f}) - endif() -endforeach() - -install(FILES - ${Eigen_directory_files_to_install} - DESTINATION ${INCLUDE_INSTALL_DIR}/Eigen COMPONENT Devel - ) - -install(DIRECTORY src DESTINATION ${INCLUDE_INSTALL_DIR}/Eigen COMPONENT Devel FILES_MATCHING PATTERN "*.h") |