diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-07-08 22:43:43 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-07-08 22:43:54 -0700 |
| commit | 7b12b4349ad96977b2631dce3246b6f84948d85f (patch) | |
| tree | 3f4faec248df8e67afa6ddcdc6268fc94c77689b | |
| parent | 8d011eee976962a460bd8ed361ae8cc1b339651e (diff) | |
| download | vcpkg-7b12b4349ad96977b2631dce3246b6f84948d85f.tar.gz vcpkg-7b12b4349ad96977b2631dce3246b6f84948d85f.zip | |
[eigen3] Copy includes from packages dir instead of source, since they're already being installed.
| -rw-r--r-- | ports/eigen3/CONTROL | 2 | ||||
| -rw-r--r-- | ports/eigen3/portfile.cmake | 9 |
2 files changed, 4 insertions, 7 deletions
diff --git a/ports/eigen3/CONTROL b/ports/eigen3/CONTROL index d93fc145a..8e397a6d0 100644 --- a/ports/eigen3/CONTROL +++ b/ports/eigen3/CONTROL @@ -1,3 +1,3 @@ Source: eigen3 -Version: 3.3.3-4 +Version: 3.3.3-5 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 219abadfa..6afe3a9e4 100644 --- a/ports/eigen3/portfile.cmake +++ b/ports/eigen3/portfile.cmake @@ -10,7 +10,7 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive(${ARCHIVE}) # check if required file exists if((NOT EXISTS ${SOURCE_PATH}/Eigen/CMakeLists.txt) OR (NOT EXISTS ${SOURCE_PATH}/unsupported/Eigen/CMakeLists.txt)) - message(STATUS "Missing CMakeLists.txt in cache, remove ${CURRENT_BUILDTREES_DIR} and try again.") + message(STATUS "Missing CMakeLists.txt in cache, re-extracting.") file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}) vcpkg_extract_source_archive(${ARCHIVE}) endif() @@ -32,12 +32,9 @@ file(READ "${CURRENT_PACKAGES_DIR}/share/eigen3/Eigen3Targets.cmake" EIGEN_TARGE string(REPLACE "set(_IMPORT_PREFIX " "get_filename_component(_IMPORT_PREFIX \"\${CMAKE_CURRENT_LIST_DIR}/../..\" ABSOLUTE) #" EIGEN_TARGETS "${EIGEN_TARGETS}") file(WRITE "${CURRENT_PACKAGES_DIR}/share/eigen3/Eigen3Targets.cmake" "${EIGEN_TARGETS}") +file(GLOB INCLUDES ${CURRENT_PACKAGES_DIR}/include/eigen3/*) # Copy the eigen header files to conventional location for user-wide MSBuild integration -file(COPY ${SOURCE_PATH}/Eigen DESTINATION ${CURRENT_PACKAGES_DIR}/include) -# and no need to leave CMakeLists.txt there -if(EXISTS ${CURRENT_PACKAGES_DIR}/include/Eigen/CMakeLists.txt) - file(REMOVE ${CURRENT_PACKAGES_DIR}/include/Eigen/CMakeLists.txt) -endif() +file(COPY ${INCLUDES} DESTINATION ${CURRENT_PACKAGES_DIR}/include) # Put the licence file where vcpkg expects it file(COPY ${SOURCE_PATH}/COPYING.README DESTINATION ${CURRENT_PACKAGES_DIR}/share/eigen3) |