diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-11-17 18:34:41 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-17 18:34:41 -0800 |
| commit | 06819e43e30b64769d1ef036d20f6038dab4da34 (patch) | |
| tree | 53c374a07b88db23a4d8617d0c507943abecb0ba | |
| parent | fcfa1e40da226ae820385407d50e5075c3011b3a (diff) | |
| parent | 85fe5932cf171359f997869a5cb351df7031e51d (diff) | |
| download | vcpkg-06819e43e30b64769d1ef036d20f6038dab4da34.tar.gz vcpkg-06819e43e30b64769d1ef036d20f6038dab4da34.zip | |
Merge pull request #2219 from cdcseacave/master
[ceres] enable static CRT linkage for MSVC
| -rw-r--r-- | ports/ceres/portfile.cmake | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ports/ceres/portfile.cmake b/ports/ceres/portfile.cmake index 49353205e..e8ae03ce4 100644 --- a/ports/ceres/portfile.cmake +++ b/ports/ceres/portfile.cmake @@ -1,5 +1,9 @@ +set(MSVC_USE_STATIC_CRT_VALUE OFF) if(VCPKG_CRT_LINKAGE STREQUAL "static") - message(FATAL_ERROR "Ceres does not currently support static CRT linkage") + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + message(FATAL_ERROR "Ceres does not currently support mixing static CRT and dynamic library linkage") + endif() + set(MSVC_USE_STATIC_CRT_VALUE ON) endif() include(vcpkg_common_functions) @@ -32,6 +36,7 @@ vcpkg_configure_cmake( -DSUITESPARSE=ON -DGFLAGS_PREFER_EXPORTED_GFLAGS_CMAKE_CONFIGURATION=OFF # TheiaSfm doesn't work well with this -DGLOG_PREFER_EXPORTED_GLOG_CMAKE_CONFIGURATION=OFF # TheiaSfm doesn't work well with this + -DMSVC_USE_STATIC_CRT=${MSVC_USE_STATIC_CRT_VALUE} ) vcpkg_install_cmake() |