diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-07-18 12:06:27 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-18 12:06:27 -0700 |
| commit | e9916d407a52af2254f5f7bff2ae4e4ae727f042 (patch) | |
| tree | 5ee2275e349762ea71b5878edffc968a53e5713c | |
| parent | f31dd7dcaf174d32275673632dbca2df0eed44f1 (diff) | |
| parent | c5bf43980811520752252004fc834840b0bcf653 (diff) | |
| download | vcpkg-e9916d407a52af2254f5f7bff2ae4e4ae727f042.tar.gz vcpkg-e9916d407a52af2254f5f7bff2ae4e4ae727f042.zip | |
Merge pull request #1469 from saedrna/master
fix CeresConfig.cmake
| -rw-r--r-- | ports/ceres/portfile.cmake | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/ports/ceres/portfile.cmake b/ports/ceres/portfile.cmake index 61cb4a009..68ad24425 100644 --- a/ports/ceres/portfile.cmake +++ b/ports/ceres/portfile.cmake @@ -55,17 +55,20 @@ vcpkg_configure_cmake( ) vcpkg_install_cmake() - vcpkg_fixup_cmake_targets(CONFIG_PATH "CMake") +file(READ ${CURRENT_PACKAGES_DIR}/share/${PORT}/CeresConfig.cmake CERES_MODULE) +string(REPLACE "\${CERES_CURRENT_CONFIG_DIR}/../" "\${CERES_CURRENT_CONFIG_DIR}/../../" CERES_MODULE "${CERES_MODULE}") +file(WRITE ${CURRENT_PACKAGES_DIR}/share/${PORT}/CeresConfig.cmake "${CERES_MODULE}") + vcpkg_copy_pdbs() #clean file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(REMOVE ${CURRENT_PACKAGES_DIR}/share/ceres/FindEigen.cmake) -file(REMOVE ${CURRENT_PACKAGES_DIR}/share/ceres/FindGflags.cmake) -file(REMOVE ${CURRENT_PACKAGES_DIR}/share/ceres/FindGlog.cmake) +# file(REMOVE ${CURRENT_PACKAGES_DIR}/share/ceres/FindEigen.cmake) +# file(REMOVE ${CURRENT_PACKAGES_DIR}/share/ceres/FindGflags.cmake) +# file(REMOVE ${CURRENT_PACKAGES_DIR}/share/ceres/FindGlog.cmake) # Handle copyright of suitesparse and metis file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/ceres) |