Commit: 4d19f24ba74c6c08d7add7946856e8af1e1e5640
Author: Campbell Barton
Date:   Fri May 18 14:26:02 2018 +0200
Branches: master
https://developer.blender.org/rB4d19f24ba74c6c08d7add7946856e8af1e1e5640

Cleanup: remove deprecated definitions

===================================================================

M       CMakeLists.txt

===================================================================

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f0930866d64..3e23b5f9986 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -66,21 +66,12 @@ endif()
 # set_property(GLOBAL PROPERTY RULE_MESSAGES OFF)
 
 # global compile definitions since add_definitions() adds for all.
-
-if(NOT (${CMAKE_VERSION} VERSION_LESS 3.0))
-       set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS
-               $<$<CONFIG:Debug>:DEBUG;_DEBUG>
-               $<$<CONFIG:Release>:NDEBUG>
-               $<$<CONFIG:MinSizeRel>:NDEBUG>
-               $<$<CONFIG:RelWithDebInfo>:NDEBUG>
-       )
-else()
-       # keep until CMake-3.0 is min requirement
-       set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_DEBUG        
   DEBUG _DEBUG)
-       set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_RELEASE      
   NDEBUG)
-       set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_MINSIZEREL   
   NDEBUG)
-       set_property(DIRECTORY APPEND PROPERTY 
COMPILE_DEFINITIONS_RELWITHDEBINFO  NDEBUG)
-endif()
+set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS
+       $<$<CONFIG:Debug>:DEBUG;_DEBUG>
+       $<$<CONFIG:Release>:NDEBUG>
+       $<$<CONFIG:MinSizeRel>:NDEBUG>
+       $<$<CONFIG:RelWithDebInfo>:NDEBUG>
+)
 
 #-----------------------------------------------------------------------------
 # Set policy

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to