Merge commit '3bf25268' into releases/tokudb-7.5

02cd38d8 · Rich Prohaska · a2471102 · bd415e73 · 02cd38d8
Commit 02cd38d8 authored Oct 07, 2014 by Rich Prohaska
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

cmake_modules/TokuSetupCompiler.cmake cmake_modules/TokuSetupCompiler.cmake +5 -5

No files found.
--- a/cmake_modules/TokuSetupCompiler.cmake
+++ b/cmake_modules/TokuSetupCompiler.cmake
@@ -23,15 +23,15 @@ if (NOT CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
 endif ()

 ## add TOKU_PTHREAD_DEBUG for debug builds
-if (CMAKE_VERSION VERSION_GREATER 2.8)
+if (CMAKE_VERSION VERSION_LESS 3.0)
+  set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_DEBUG TOKU_PTHREAD_DEBUG=1)
+  set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_DRD TOKU_PTHREAD_DEBUG=1)
+  set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_DRD _FORTIFY_SOURCE=2)
+else ()
  set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS
    $<$<OR:$<CONFIG:DEBUG>,$<CONFIG:DRD>>:TOKU_PTHREAD_DEBUG=1>
    $<$<CONFIG:DRD>:_FORTIFY_SOURCE=2>
    )
-else ()
-  set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_DEBUG TOKU_PTHREAD_DEBUG=1)
-  set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_DRD TOKU_PTHREAD_DEBUG=1)
-  set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_DRD _FORTIFY_SOURCE=2)
 endif ()

 ## coverage