From c5bf43980811520752252004fc834840b0bcf653 Mon Sep 17 00:00:00 2001 From: Han Hu Date: Mon, 17 Jul 2017 17:38:36 +0800 Subject: [PATCH] 1 fix relative path for looking include directory 2 install the additional FindEigen Gflags Glog file, because the original ***Config.cmake file of the library do not define proper variable for use in CeresConfig.cmake --- ports/ceres/portfile.cmake | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/ports/ceres/portfile.cmake b/ports/ceres/portfile.cmake index 61cb4a009e..68ad244256 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)