diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-06-13 23:44:19 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-13 23:44:19 -0700 |
| commit | 9addc14b37bfd1ee3947328a0fcdffd17d19e4e8 (patch) | |
| tree | fbc5aa64d49b52cdce0620ebcf5a57fb96c7ba15 /ports/ceres | |
| parent | 50fca8f92acd0e0a6ae082e67d58c59e01a51ad5 (diff) | |
| parent | 27bb11f6fc0da827190571125b62db8df5c86c68 (diff) | |
| download | vcpkg-9addc14b37bfd1ee3947328a0fcdffd17d19e4e8.tar.gz vcpkg-9addc14b37bfd1ee3947328a0fcdffd17d19e4e8.zip | |
Merge pull request #1259 from KindDragon/ceres-fix
Ceres-solver fix
Diffstat (limited to 'ports/ceres')
| -rw-r--r-- | ports/ceres/CONTROL | 2 | ||||
| -rw-r--r-- | ports/ceres/portfile.cmake | 66 |
2 files changed, 33 insertions, 35 deletions
diff --git a/ports/ceres/CONTROL b/ports/ceres/CONTROL index d8c4c4ec6..4266bbac1 100644 --- a/ports/ceres/CONTROL +++ b/ports/ceres/CONTROL @@ -1,4 +1,4 @@ Source: ceres -Version: 1.12.0 +Version: 1.12.0-1 Build-Depends:suitesparse, eigen3, clapack, gflags, glog Description: non-linear optimization package
\ No newline at end of file diff --git a/ports/ceres/portfile.cmake b/ports/ceres/portfile.cmake index 0ed2c94b8..61cb4a009 100644 --- a/ports/ceres/portfile.cmake +++ b/ports/ceres/portfile.cmake @@ -29,46 +29,44 @@ vcpkg_from_github( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} - #PREFER_NINJA # Disable this option if project cannot be built with Ninja - - OPTIONS - -DEXPORT_BUILD_DIR=ON - -DBUILD_EXAMPLES=OFF - -DBUILD_TESTING=OFF - -DEIGENSPARSE=ON - -DSUITESPARSE=ON - -DCXSPARSE=ON - #-DBUILD_SHARED_LIBS=OFF - -DCXSPARSE_INCLUDE_DIR=${SUITESPARSE_INCLUDE_DIR} - -DCXSPARSE_LIBRARY=${CURRENT_INSTALLED_DIR}/lib/libcxsparse.lib - -DSUITESPARSE_INCLUDE_DIR_HINTS=${CURRENT_INSTALLED_DIR}/include/suitesparse - -DEIGEN_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include/eigen3 - -DLAPACK_LIBRARIES=${CURRENT_INSTALLED_DIR}/lib/lapack.lib - -DBLAS_LIBRARIES=${CURRENT_INSTALLED_DIR}/lib/openblas.lib - -DMETIS_LIBRARY=${CURRENT_INSTALLED_DIR}/lib/metis.lib - -DGFLAGS_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include - -DGFLAGS_LIBRARY=${CURRENT_INSTALLED_DIR}/lib/gflags.lib - -DGLOG_INCLUDE_DIR=${PACKAGES_INCLUDE_DIR} - -DGLOG_LIBRARY=${CURRENT_INSTALLED_DIR}/lib/glog.lib - - OPTIONS_RELEASE - -DSUITESPARSE_LIBRARY_DIR_HINTS=${CURRENT_INSTALLED_DIR}/lib - - OPTIONS_DEBUG - -DSUITESPARSEQR_LIBRARY=${CURRENT_INSTALLED_DIR}/debug/lib/libspqrd.lib - -DSUITESPARSE_LIBRARY_DIR_HINTS=${CURRENT_INSTALLED_DIR}/debug/lib - + OPTIONS + -DEXPORT_BUILD_DIR=ON + -DBUILD_EXAMPLES=OFF + -DBUILD_TESTING=OFF + -DCXSPARSE=ON + -DEIGENSPARSE=ON + -DSUITESPARSE=ON + -DBLAS_LIBRARIES=${CURRENT_INSTALLED_DIR}/lib/openblas.lib + -DCXSPARSE_INCLUDE_DIR=${SUITESPARSE_INCLUDE_DIR} + -DCXSPARSE_LIBRARY=${CURRENT_INSTALLED_DIR}/lib/libcxsparse.lib + -DEIGEN_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include/eigen3 + -DGFLAGS_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include + -DGFLAGS_LIBRARY=${CURRENT_INSTALLED_DIR}/lib/gflags.lib + -DGLOG_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include + -DGLOG_LIBRARY=${CURRENT_INSTALLED_DIR}/lib/glog.lib + -DLAPACK_LIBRARIES=${CURRENT_INSTALLED_DIR}/lib/lapack.lib + -DMETIS_LIBRARY=${CURRENT_INSTALLED_DIR}/lib/metis.lib + -DSUITESPARSE_INCLUDE_DIR_HINTS=${CURRENT_INSTALLED_DIR}/include/suitesparse + OPTIONS_RELEASE + -DSUITESPARSE_LIBRARY_DIR_HINTS=${CURRENT_INSTALLED_DIR}/lib + OPTIONS_DEBUG + -DSUITESPARSEQR_LIBRARY=${CURRENT_INSTALLED_DIR}/debug/lib/libspqrd.lib + -DSUITESPARSE_LIBRARY_DIR_HINTS=${CURRENT_INSTALLED_DIR}/debug/lib ) + vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH "CMake") + vcpkg_copy_pdbs() -#clean -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/CMake) +#clean file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/CMake) +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) # Handle copyright of suitesparse and metis file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/ceres) file(RENAME ${CURRENT_PACKAGES_DIR}/share/ceres/LICENSE ${CURRENT_PACKAGES_DIR}/share/ceres/copyright) - - |