From 9b57ecbdd786113e33d8a149d240769682c7846e Mon Sep 17 00:00:00 2001 From: mmazaherit Date: Thu, 8 Jun 2017 23:53:01 -0400 Subject: [PATCH 1/2] check in ceres-solver port --- ports/ceres-solver/CONTROL | 4 ++ ports/ceres-solver/portfile.cmake | 71 +++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+) create mode 100644 ports/ceres-solver/CONTROL create mode 100644 ports/ceres-solver/portfile.cmake diff --git a/ports/ceres-solver/CONTROL b/ports/ceres-solver/CONTROL new file mode 100644 index 000000000..2084f200c --- /dev/null +++ b/ports/ceres-solver/CONTROL @@ -0,0 +1,4 @@ +Source: ceres-solver +Version: 1.12.0 +Build-Depends:suitesparse, eigen3, clapack, gflags, glog +Description: non-linear optimization package \ No newline at end of file diff --git a/ports/ceres-solver/portfile.cmake b/ports/ceres-solver/portfile.cmake new file mode 100644 index 000000000..b42dc04e3 --- /dev/null +++ b/ports/ceres-solver/portfile.cmake @@ -0,0 +1,71 @@ +# Common Ambient Variables: +# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} +# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} +# CURRENT_PORT DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} +# PORT = current port name (zlib, etc) +# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) +# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) +# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) +# VCPKG_ROOT_DIR = +# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) +# + +include(vcpkg_common_functions) + +set (CERES_VER 1.12.0) #update SHA512 checksum w.r.t to verison +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/ceres-solver-${CERES_VER}) + +vcpkg_download_distfile(ARCHIVE +URLS "https://github.com/ceres-solver/ceres-solver/archive/${CERES_VER}.zip" +FILENAME "ceres-solver-${CERES_VER}.zip" +SHA512 cbd476e4be89cad3c3366cd2396be46a49e8672932219d48fcd54f2eef8e86ee7fd9a824aa9743d13324b3ea9ba90501ede0297713a4d5844be75ce95418ecc1 +) + +vcpkg_extract_source_archive(${ARCHIVE}) + + +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 + +) +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +#clean +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/CMake) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/CMake) + +# Handle copyright of suitesparse and metis +file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/ceres-solver) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/ceres-solver/LICENSE ${CURRENT_PACKAGES_DIR}/share/ceres-solver/copyright) + + From fea889c5d917a60cc94a38e2f2eafdc7c2eb9fdc Mon Sep 17 00:00:00 2001 From: mmazaherit Date: Fri, 9 Jun 2017 13:16:58 -0400 Subject: [PATCH 2/2] Updated the ceres port --- ports/{ceres-solver => ceres}/CONTROL | 2 +- ports/{ceres-solver => ceres}/portfile.cmake | 21 ++++++++++---------- 2 files changed, 11 insertions(+), 12 deletions(-) rename ports/{ceres-solver => ceres}/CONTROL (52%) rename ports/{ceres-solver => ceres}/portfile.cmake (78%) diff --git a/ports/ceres-solver/CONTROL b/ports/ceres/CONTROL similarity index 52% rename from ports/ceres-solver/CONTROL rename to ports/ceres/CONTROL index 2084f200c..d8c4c4ec6 100644 --- a/ports/ceres-solver/CONTROL +++ b/ports/ceres/CONTROL @@ -1,4 +1,4 @@ -Source: ceres-solver +Source: ceres Version: 1.12.0 Build-Depends:suitesparse, eigen3, clapack, gflags, glog Description: non-linear optimization package \ No newline at end of file diff --git a/ports/ceres-solver/portfile.cmake b/ports/ceres/portfile.cmake similarity index 78% rename from ports/ceres-solver/portfile.cmake rename to ports/ceres/portfile.cmake index b42dc04e3..a488b6da9 100644 --- a/ports/ceres-solver/portfile.cmake +++ b/ports/ceres/portfile.cmake @@ -12,18 +12,17 @@ include(vcpkg_common_functions) -set (CERES_VER 1.12.0) #update SHA512 checksum w.r.t to verison -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/ceres-solver-${CERES_VER}) +set(VCPKG_PLATFORM_TOOLSET "v140") # Force VS2015 because VS2017 compiler return internal error +# eigen3\eigen\src\core\redux.h(237): fatal error C1001: An internal error has occurred in the compiler. [internal\ceres\ceres.vcxproj] -vcpkg_download_distfile(ARCHIVE -URLS "https://github.com/ceres-solver/ceres-solver/archive/${CERES_VER}.zip" -FILENAME "ceres-solver-${CERES_VER}.zip" -SHA512 cbd476e4be89cad3c3366cd2396be46a49e8672932219d48fcd54f2eef8e86ee7fd9a824aa9743d13324b3ea9ba90501ede0297713a4d5844be75ce95418ecc1 +vcpkg_from_github( +OUT_SOURCE_PATH SOURCE_PATH +REPO ceres-solver/ceres-solver +REF 1.12.0 +SHA512 4b4cba5627fbd80a626e8a31d9f561d6cee1c8345970304e4b5b163a9dcadc6d636257d1046ecede00781a11229ef671ee89c3e7e6baf15f49f63f36e6a2ebe1 +HEAD_REF master ) -vcpkg_extract_source_archive(${ARCHIVE}) - - vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} #PREFER_NINJA # Disable this option if project cannot be built with Ninja @@ -65,7 +64,7 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/CMake) # Handle copyright of suitesparse and metis -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/ceres-solver) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/ceres-solver/LICENSE ${CURRENT_PACKAGES_DIR}/share/ceres-solver/copyright) +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)