Browse Source

Fixed incompatibilities between Windows.h and Qt 5 (NOMINMAX).

Stefan Kislinskiy 10 years ago
parent
commit
500228260f

+ 3 - 0
Libs/Core/Testing/Cpp/CMakeLists.txt

@@ -120,6 +120,9 @@ target_link_libraries(${KIT}CppTests ${LIBRARY_NAME} ${CTK_BASE_LIBRARIES} CTKDu
 
 if(CTK_QT_VERSION VERSION_GREATER "4")
   qt5_use_modules(${KIT}CppTests Test Widgets)
+  if(WIN32)
+    set_target_properties(${KIT}CppTests PROPERTIES COMPILE_DEFINITIONS NOMINMAX)
+  endif()
 endif()
 
 if(UNIX AND NOT APPLE)

+ 4 - 0
Libs/DICOM/Core/CMakeLists.txt

@@ -140,6 +140,10 @@ ctkMacroBuildLib(
   LIBRARY_TYPE ${CTK_LIBRARY_MODE}
   )
 
+if(CTK_QT_VERSION VERSION_GREATER "4" AND DEFINED WIN32)
+  set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_DEFINITIONS NOMINMAX)
+endif()
+
 if(DEFINED DCMTK_HAVE_CONFIG_H_OPTIONAL AND NOT DCMTK_HAVE_CONFIG_H_OPTIONAL)
   # Workaround Debian packaging issue - See FindDCMTK.cmake for more details
   set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_DEFINITIONS ${DCMTK_DEFINITIONS})

+ 3 - 0
Libs/DICOM/Core/Testing/Cpp/CMakeLists.txt

@@ -30,6 +30,9 @@ target_link_libraries(${KIT}CppTests ${LIBRARY_NAME})
 
 if(CTK_QT_VERSION VERSION_GREATER "4")
   target_link_libraries(${KIT}CppTests Qt5::Widgets)
+  if(WIN32)
+    set_target_properties(${KIT}CppTests PROPERTIES COMPILE_DEFINITIONS NOMINMAX)
+  endif()
 endif()
 
 #

+ 5 - 0
Libs/DICOM/Widgets/CMakeLists.txt

@@ -95,6 +95,11 @@ ctkMacroBuildLib(
   LIBRARY_TYPE ${CTK_LIBRARY_MODE}
   )
 
+if(CTK_QT_VERSION VERSION_GREATER "4" AND DEFINED WIN32)
+  set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_DEFINITIONS NOMINMAX)
+endif()
+
+
 if(CTK_WRAP_PYTHONQT_LIGHT)
   ctkMacroBuildLibWrapper(
     TARGET ${PROJECT_NAME}

+ 4 - 0
Libs/DICOM/Widgets/Plugins/CMakeLists.txt

@@ -48,3 +48,7 @@ ctkMacroBuildQtDesignerPlugin(
   RESOURCES ${PLUGIN_resources}
   TARGET_LIBRARIES ${PLUGIN_target_libraries}
 )
+
+if(CTK_QT_VERSION VERSION_GREATER "4" AND DEFINED WIN32)
+  set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_DEFINITIONS NOMINMAX)
+endif()

+ 4 - 0
Libs/DICOM/Widgets/Testing/Cpp/CMakeLists.txt

@@ -22,6 +22,10 @@ set(LIBRARY_NAME ${PROJECT_NAME})
 add_executable(${KIT}CppTests ${Tests})
 target_link_libraries(${KIT}CppTests ${LIBRARY_NAME})
 
+if(CTK_QT_VERSION VERSION_GREATER "4" AND DEFINED WIN32)
+  set_target_properties(${KIT}CppTests PROPERTIES COMPILE_DEFINITIONS NOMINMAX)
+endif()
+
 #
 # Add Tests
 #

+ 4 - 0
Libs/PluginFramework/Testing/org.commontk.pluginfwtest.perf/CMakeLists.txt

@@ -39,6 +39,10 @@ ctkMacroBuildPlugin(
   TEST_PLUGIN
 )
 
+if(CTK_QT_VERSION VERSION_GREATER "4" AND DEFINED WIN32)
+  set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_DEFINITIONS NOMINMAX)
+endif()
+
 # =========== Build the test executable ===============
 set(SRCS
   ctkPluginFrameworkTestPerfMain.cpp

+ 4 - 0
Plugins/org.commontk.dah.core/CMakeLists.txt

@@ -61,6 +61,10 @@ ctkMacroBuildPlugin(
   TARGET_LIBRARIES ${PLUGIN_target_libraries}
 )
 
+if(CTK_QT_VERSION VERSION_GREATER "4" AND DEFINED WIN32)
+  set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_DEFINITIONS NOMINMAX)
+endif()
+
 if(BUILD_TESTING)
   add_subdirectory(Testing)
 endif()