aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Karatarakis <alex@karatarakis.com>2017-05-10 13:22:18 -0700
committerGitHub <noreply@github.com>2017-05-10 13:22:18 -0700
commit4e9e62f6ef6a45680a8453c31b39e7504a7a0605 (patch)
treed015401e850dca0f8be15ff32d7ee5beac5a3df3
parentc25faaa7e91bd5dd75b5d326aaf0fd5ca745d50c (diff)
parent8e28f8c35156d6de6058208a3869e5ced4d8e388 (diff)
downloadvcpkg-4e9e62f6ef6a45680a8453c31b39e7504a7a0605.tar.gz
vcpkg-4e9e62f6ef6a45680a8453c31b39e7504a7a0605.zip
Merge pull request #1045 from ajshort/patch-1
Use CMake to build Eigen3
-rw-r--r--ports/eigen3/CONTROL2
-rw-r--r--ports/eigen3/portfile.cmake18
2 files changed, 6 insertions, 14 deletions
diff --git a/ports/eigen3/CONTROL b/ports/eigen3/CONTROL
index 0b3b1a7e0..6c16d8b4b 100644
--- a/ports/eigen3/CONTROL
+++ b/ports/eigen3/CONTROL
@@ -1,3 +1,3 @@
Source: eigen3
-Version: 3.3.3
+Version: 3.3.3-1
Description: C++ template library for linear algebra: matrices, vectors, numerical solvers, and related algorithms.
diff --git a/ports/eigen3/portfile.cmake b/ports/eigen3/portfile.cmake
index 5b80225d8..c3c0b695a 100644
--- a/ports/eigen3/portfile.cmake
+++ b/ports/eigen3/portfile.cmake
@@ -8,20 +8,12 @@ vcpkg_download_distfile(ARCHIVE
)
vcpkg_extract_source_archive(${ARCHIVE})
-file(GLOB_RECURSE GARBAGE ${SOURCE_PATH}/Eigen/CMakeLists.* ${SOURCE_PATH}/unsupported/Eigen/CMakeLists.*)
-if(GARBAGE)
- file(REMOVE ${GARBAGE})
-endif()
+
+vcpkg_configure_cmake(SOURCE_PATH ${SOURCE_PATH})
+vcpkg_install_cmake()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
# Put the licence file where vcpkg expects it
file(COPY ${SOURCE_PATH}/COPYING.README DESTINATION ${CURRENT_PACKAGES_DIR}/share/eigen3)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/eigen3/COPYING.README ${CURRENT_PACKAGES_DIR}/share/eigen3/copyright)
-
-# Copy the eigen header files
-file(COPY ${SOURCE_PATH}/Eigen ${SOURCE_PATH}/signature_of_eigen3_matrix_library
- DESTINATION ${CURRENT_PACKAGES_DIR}/include)
-file(COPY ${SOURCE_PATH}/unsupported/Eigen
- DESTINATION ${CURRENT_PACKAGES_DIR}/include/unsupported)
-
-# Copy signature file so tools can locate the eigen headers
-file(COPY DESTINATION ${CURRENT_PACKAGES_DIR}/include)