Mercurial > hg > orthanc
changeset 4309:73de065622ec
missing cmake parameters if building unit tests of framework
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Sat, 07 Nov 2020 08:02:36 +0100 |
| parents | b873c8e24125 |
| children | 2ae905070221 |
| files | OrthancFramework/SharedLibrary/CMakeLists.txt OrthancFramework/UnitTestsSources/CMakeLists.txt |
| diffstat | 2 files changed, 7 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/OrthancFramework/SharedLibrary/CMakeLists.txt Fri Nov 06 21:15:09 2020 +0100 +++ b/OrthancFramework/SharedLibrary/CMakeLists.txt Sat Nov 07 08:02:36 2020 +0100 @@ -507,9 +507,11 @@ -DORTHANC_FRAMEWORK_STATIC:BOOL=${STATIC_BUILD} -DALLOW_DOWNLOADS:BOOL=${ALLOW_DOWNLOADS} + -DBOOST_LOCALE_BACKEND:STRING=${BOOST_LOCALE_BACKEND} -DSTATIC_BUILD:BOOL=${STATIC_BUILD} -DUNIT_TESTS_WITH_HTTP_CONNEXIONS:BOOL=${UNIT_TESTS_WITH_HTTP_CONNEXIONS} -DUSE_GOOGLE_TEST_DEBIAN_PACKAGE:BOOL=${USE_GOOGLE_TEST_DEBIAN_PACKAGE} + -DUSE_SYSTEM_BOOST:BOOL=${USE_SYSTEM_BOOST} -DUSE_SYSTEM_GOOGLE_TEST:BOOL=${USE_SYSTEM_GOOGLE_TEST} ${Flags}
--- a/OrthancFramework/UnitTestsSources/CMakeLists.txt Fri Nov 06 21:15:09 2020 +0100 +++ b/OrthancFramework/UnitTestsSources/CMakeLists.txt Sat Nov 07 08:02:36 2020 +0100 @@ -28,7 +28,12 @@ set(ALLOW_DOWNLOADS OFF CACHE BOOL "Allow CMake to download packages") set(STATIC_BUILD OFF CACHE BOOL "Static build of the third-party libraries (necessary for Windows)") set(UNIT_TESTS_WITH_HTTP_CONNEXIONS ON CACHE BOOL "Allow unit tests to make HTTP requests") + set(USE_GOOGLE_TEST_DEBIAN_PACKAGE OFF CACHE BOOL "Use the sources of Google Test shipped with libgtest-dev (Debian only)") +set(USE_SYSTEM_BOOST ON CACHE BOOL "Use the system version of Boost") +set(USE_SYSTEM_GOOGLE_TEST ON CACHE BOOL "Use the system version of Google Test") + +set(BOOST_LOCALE_BACKEND "libiconv" CACHE STRING "Back-end for locales that is used by Boost (can be \"gcc\", \"libiconv\", \"icu\", or \"wconv\" on Windows)") set(USE_CXX11 OFF CACHE BOOL "Whether to enable compiler support for C++11") if (UNIT_TESTS_WITH_HTTP_CONNEXIONS)