Bläddra i källkod

Add NOMINMAX definition to global compile flags.

Stefan Kislinskiy 10 år sedan
förälder
incheckning
30d745a234

+ 1 - 1
CMakeLists.txt

@@ -375,7 +375,7 @@ if(MSVC)
   set(msvc_suppressed_warnings
     "/wd4290" # C++ exception specification ignored except to indicate a function is not __declspec(nothrow)
   )
-  set(CTK_CXX_FLAGS "${CTK_CXX_FLAGS} ${msvc_suppressed_warnings}")
+  set(CTK_CXX_FLAGS "${CTK_CXX_FLAGS} ${msvc_suppressed_warnings} -DNOMINMAX")
 endif()
 
 #-----------------------------------------------------------------------------

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

@@ -120,9 +120,6 @@ 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)

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

@@ -140,10 +140,6 @@ 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})

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

@@ -30,9 +30,6 @@ 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()
 
 #

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

@@ -95,11 +95,6 @@ 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}

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

@@ -48,7 +48,3 @@ 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()

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

@@ -22,10 +22,6 @@ 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
 #

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

@@ -39,10 +39,6 @@ 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

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

@@ -61,10 +61,6 @@ 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()