aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2016-10-31 10:07:54 -0700
committerRobert Schumacher <roschuma@microsoft.com>2016-10-31 10:07:54 -0700
commit268f5f306ff0aac8d10b31a457fc83f2eb6d09eb (patch)
treedc488cd3221b7519f698b9f2a1d158373af0fa1e
parentaa27f263e3b4a4a60f35eb20f45c132a019c8d88 (diff)
downloadvcpkg-268f5f306ff0aac8d10b31a457fc83f2eb6d09eb.tar.gz
vcpkg-268f5f306ff0aac8d10b31a457fc83f2eb6d09eb.zip
[eigen3] Deploy signature file. Deploy unsupported Eigen extensions. Fixes #230.
-rw-r--r--ports/eigen3/CONTROL2
-rw-r--r--ports/eigen3/portfile.cmake12
2 files changed, 10 insertions, 4 deletions
diff --git a/ports/eigen3/CONTROL b/ports/eigen3/CONTROL
index d5d8e074d..88ae596fb 100644
--- a/ports/eigen3/CONTROL
+++ b/ports/eigen3/CONTROL
@@ -1,3 +1,3 @@
Source: eigen3
-Version: 3.2.10-1
+Version: 3.2.10-2
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 42615b1a1..706ed9f4c 100644
--- a/ports/eigen3/portfile.cmake
+++ b/ports/eigen3/portfile.cmake
@@ -8,14 +8,20 @@ vcpkg_download_distfile(ARCHIVE
)
vcpkg_extract_source_archive(${ARCHIVE})
-file(GLOB_RECURSE GARBAGE ${SOURCE_PATH}/Eigen/CMakeLists.*)
+file(GLOB_RECURSE GARBAGE ${SOURCE_PATH}/Eigen/CMakeLists.* ${SOURCE_PATH}/unsupported/Eigen/CMakeLists.*)
if(GARBAGE)
file(REMOVE ${GARBAGE})
endif()
# Put the licence file where vcpkg expects it
-file(COPY ${SOURCE_PATH}/COPYING.README DESTINATION ${CURRENT_PACKAGES_DIR}/share/eigen3/COPYING.README)
+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/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/Eigen/) \ No newline at end of file
+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)