diff options
| author | Arkady Shapkin <arkady.shapkin@gmail.com> | 2018-05-14 17:01:26 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-14 17:01:26 +0300 |
| commit | f38fbe4abf3e17b477aca4d0036b8d135537e666 (patch) | |
| tree | e91c0b9fc02f971c03d92bd4fa23eac94c53a744 | |
| parent | 29d04b8b4005f5e2bfe61ccdc7a93d5c6c8a13d9 (diff) | |
| download | vcpkg-f38fbe4abf3e17b477aca4d0036b8d135537e666.tar.gz vcpkg-f38fbe4abf3e17b477aca4d0036b8d135537e666.zip | |
[ceres] Fix build on Linux. Closes #3490
| -rw-r--r-- | ports/ceres/portfile.cmake | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/ports/ceres/portfile.cmake b/ports/ceres/portfile.cmake index 7267be402..98621116b 100644 --- a/ports/ceres/portfile.cmake +++ b/ports/ceres/portfile.cmake @@ -1,9 +1,9 @@ set(MSVC_USE_STATIC_CRT_VALUE OFF) if(VCPKG_CRT_LINKAGE STREQUAL "static") - 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) + 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) @@ -16,9 +16,6 @@ vcpkg_from_github( HEAD_REF master ) -# Ninja crash compiler with error: -# "fatal error C1001: An internal error has occurred in the compiler. (compiler file 'f:\dd\vctools\compiler\utc\src\p2\main.c', line 255)" - set(SUITESPARSE OFF) if("suitesparse" IN_LIST FEATURES) set(SUITESPARSE ON) @@ -62,7 +59,13 @@ vcpkg_configure_cmake( ) vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH "CMake") + +if(WIN32) + vcpkg_fixup_cmake_targets(CONFIG_PATH "CMake") +else() + vcpkg_fixup_cmake_targets(CONFIG_PATH "lib${LIB_SUFFIX}/cmake/Ceres") +endif() + vcpkg_copy_pdbs() # Changes target search path |