diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-10-23 12:18:24 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-23 12:18:24 -0700 |
| commit | a33c8809663b2c0f332e4a142da3d0ec68091bd6 (patch) | |
| tree | c4c1d9aa41624802526bb4ed4e34884cb67cbedc | |
| parent | cb2ee489746fc260c60a3fbff8dc37ec48829d43 (diff) | |
| parent | 3dfffcd5fd913aeff9fd3a0e9b0efdf40b6ff49b (diff) | |
| download | vcpkg-a33c8809663b2c0f332e4a142da3d0ec68091bd6.tar.gz vcpkg-a33c8809663b2c0f332e4a142da3d0ec68091bd6.zip | |
Merge pull request #1970 from jasjuang/ceres
fix ceres VS2017 compilation error
| -rw-r--r-- | ports/ceres/CONTROL | 2 | ||||
| -rw-r--r-- | ports/ceres/portfile.cmake | 15 |
2 files changed, 1 insertions, 16 deletions
diff --git a/ports/ceres/CONTROL b/ports/ceres/CONTROL index 4dde8c0bd..300b106da 100644 --- a/ports/ceres/CONTROL +++ b/ports/ceres/CONTROL @@ -1,4 +1,4 @@ Source: ceres -Version: 1.13.0-1 +Version: 1.13.0-2 Build-Depends:suitesparse, eigen3, clapack, gflags, glog Description: non-linear optimization package diff --git a/ports/ceres/portfile.cmake b/ports/ceres/portfile.cmake index 2f9d9d6e9..49353205e 100644 --- a/ports/ceres/portfile.cmake +++ b/ports/ceres/portfile.cmake @@ -1,24 +1,9 @@ -# 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 = <C:\path\to\current\vcpkg> -# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) -# - if(VCPKG_CRT_LINKAGE STREQUAL "static") message(FATAL_ERROR "Ceres does not currently support static CRT linkage") endif() include(vcpkg_common_functions) -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_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ceres-solver/ceres-solver |