commit cb0a642e6ebb270ff70000d3209b06d9ba19c5d4 parent d6f64fa4b1d6c78afce036e3dbdcf01da59789cc Author: cfillion <cfillion@users.noreply.github.com> Date: Sat, 23 Nov 2019 16:10:22 -0500 fix linking against release vs debug libraries on windows Diffstat:
| M | CMakeLists.txt | | | 5 | +++++ |
| M | src/CMakeLists.txt | | | 12 | ++++++++++-- |
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt @@ -66,6 +66,11 @@ set(CMAKE_INTERPROCEDURAL_OPTIMIZATION_MINSIZEREL ON) set(CMAKE_INTERPROCEDURAL_OPTIMIZATION_RELEASE ON) set(CMAKE_INTERPROCEDURAL_OPTIMIZATION_RELWITHDEBINFO ON) +if(VCPKG_TOOLCHAIN) + set(CMAKE_MAP_IMPORTED_CONFIG_MINSIZEREL Release) + set(CMAKE_MAP_IMPORTED_CONFIG_RELWITHDEBINFO Release) +endif() + if(WIN32) add_compile_definitions(NOMINMAX UNICODE) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt @@ -85,16 +85,24 @@ endif() find_package(Boost 1.56 REQUIRED) find_package(CURL REQUIRED) find_package(MiniZip REQUIRED) -find_package(SQLite3 REQUIRED) find_package(Threads REQUIRED) find_package(TinyXML REQUIRED) find_package(WDL REQUIRED) target_link_libraries(reapack - ${CMAKE_DL_LIBS} Boost::headers CURL::libcurl MiniZip::MiniZip SQLite::SQLite3 + ${CMAKE_DL_LIBS} Boost::headers CURL::libcurl MiniZip::MiniZip Threads::Threads TinyXML::TinyXML WDL::WDL ) +if(VCPKG_TOOLCHAIN) + # for selecting the right debug or release version + find_package(SQLite3 CONFIG REQUIRED) + target_link_libraries(reapack sqlite3) +else() + find_package(SQLite3 REQUIRED) + target_link_libraries(reapack SQLite::SQLite3) +endif() + if(NOT APPLE AND NOT WIN32) find_package(OpenSSL REQUIRED COMPONENTS Crypto) target_link_libraries(reapack OpenSSL::Crypto)