# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1604693625 -3600
# Node ID 2a9d304b3a82b7340e12547c858b0be9ddf2131b
# Parent  548d77dfb8bce02c2f0c3c1810a4ce72d9258896
fix build of Orthanc framework DLL for Windows

diff -r 548d77dfb8bc -r 2a9d304b3a82 OrthancFramework/Resources/CMake/BoostConfiguration.cmake
--- 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(
diff -r 548d77dfb8bc -r 2a9d304b3a82 OrthancFramework/UnitTestsSources/CMakeLists.txt
--- 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}
   )