Mercurial > hg > orthanc

changeset 3773:df164cc69529

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix compatibility between MSVC and Windows XP
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 18 Mar 2020 07:57:33 +0100
parents 74889e6f6d68
children 6d2b94698995
files Resources/CMake/DcmtkConfigurationStatic-3.6.5.cmake
diffstat 1 files changed, 11 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/Resources/CMake/DcmtkConfigurationStatic-3.6.5.cmake	Tue Mar 17 19:19:48 2020 +0100
+++ b/Resources/CMake/DcmtkConfigurationStatic-3.6.5.cmake	Wed Mar 18 07:57:33 2020 +0100
@@ -185,11 +185,18 @@
   )
 
 
-if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows" AND
-    CMAKE_COMPILER_IS_GNUCXX)
-  # This is MinGW
+if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+  # For compatibility with Windows XP, avoid using fiber-local-storage
+  # in log4cplus, but use thread-local-storage instead. Otherwise,
+  # Windows XP complains about missing "FlsGetValue()" in KERNEL32.dll
   add_definitions(
     -DDCMTK_LOG4CPLUS_AVOID_WIN32_FLS
-    -DDCMTK_LOG4CPLUS_SINGLE_THREADED
     )
+
+  if (CMAKE_COMPILER_IS_GNUCXX)
+    # This is MinGW
+    add_definitions(
+      -DDCMTK_LOG4CPLUS_SINGLE_THREADED
+      )
+  endif()
 endif()