Mercurial > hg > orthanc
changeset 4307:2a9d304b3a82
fix build of Orthanc framework DLL for Windows
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Fri, 06 Nov 2020 21:13:45 +0100 |
| parents | 548d77dfb8bc |
| children | b873c8e24125 |
| files | OrthancFramework/Resources/CMake/BoostConfiguration.cmake OrthancFramework/UnitTestsSources/CMakeLists.txt |
| diffstat | 2 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/OrthancFramework/Resources/CMake/BoostConfiguration.cmake Fri Nov 06 18:15:11 2020 +0100 +++ b/OrthancFramework/Resources/CMake/BoostConfiguration.cmake Fri Nov 06 21:13:45 2020 +0100 @@ -130,10 +130,10 @@ if (ORTHANC_BUILDING_FRAMEWORK_LIBRARY) add_definitions( - # Packaging Boost inside the Orthanc Framework DLL - -DBOOST_ALL_DYN_LINK + # Packaging Boost inside the Orthanc Framework DLL, not exposing + # the Boost symbols -DBOOST_THREAD_BUILD_DLL - #-DBOOST_REGEX_BUILD_DLL + -DBOOST_REGEX_BUILD_DLL ) else() add_definitions(
--- a/OrthancFramework/UnitTestsSources/CMakeLists.txt Fri Nov 06 18:15:11 2020 +0100 +++ b/OrthancFramework/UnitTestsSources/CMakeLists.txt Fri Nov 06 21:13:45 2020 +0100 @@ -50,6 +50,7 @@ set(ENABLE_GOOGLE_TEST ON) include(${CMAKE_SOURCE_DIR}/../Resources/CMake/DownloadOrthancFramework.cmake) +include(${CMAKE_SOURCE_DIR}/../Resources/CMake/BoostConfiguration.cmake) include(${CMAKE_SOURCE_DIR}/../Resources/CMake/GoogleTestConfiguration.cmake) if (USE_CXX11) @@ -87,6 +88,7 @@ ${CMAKE_SOURCE_DIR}/ZipTests.cpp ${AUTOGENERATED_SOURCES} + ${BOOST_SOURCES} ${GOOGLE_TEST_SOURCES} )