diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-07-08 22:44:14 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-08 22:44:14 -0700 |
| commit | 0d7961a8509f34a6d43697b701657989ba08fb67 (patch) | |
| tree | 2b9286a841927c15cbe7a590a17767a5c558396d | |
| parent | d51d56107b71f79ccad1739b3c897f01184b9fa7 (diff) | |
| parent | 7b12b4349ad96977b2631dce3246b6f84948d85f (diff) | |
| download | vcpkg-0d7961a8509f34a6d43697b701657989ba08fb67.tar.gz vcpkg-0d7961a8509f34a6d43697b701657989ba08fb67.zip | |
Merge pull request #1413 from twMr7/master
[eigen3] fix the missing CMakeLists.txt problem
| -rw-r--r-- | ports/eigen3/CONTROL | 2 | ||||
| -rw-r--r-- | ports/eigen3/portfile.cmake | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/ports/eigen3/CONTROL b/ports/eigen3/CONTROL index 4dd1cd983..8e397a6d0 100644 --- a/ports/eigen3/CONTROL +++ b/ports/eigen3/CONTROL @@ -1,3 +1,3 @@ Source: eigen3 -Version: 3.3.3-3 +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 ba968950a..6afe3a9e4 100644 --- a/ports/eigen3/portfile.cmake +++ b/ports/eigen3/portfile.cmake @@ -6,7 +6,14 @@ vcpkg_download_distfile(ARCHIVE FILENAME "eigen-3.3.3.tar.bz2" SHA512 bb5a8b761371e516f0a344a7c9f6e369e21c2907c8548227933ca6010fc607a66c8d6ff7c41b1aec3dea7d482ce8c2a09e38ae5c7a2c5b16bdd8007e7a81ecc3 ) + 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, re-extracting.") + file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}) + vcpkg_extract_source_archive(${ARCHIVE}) +endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} @@ -25,6 +32,10 @@ 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 ${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) file(RENAME ${CURRENT_PACKAGES_DIR}/share/eigen3/COPYING.README ${CURRENT_PACKAGES_DIR}/share/eigen3/copyright) |