Commit 18f4a7e5 authored by Leif Walsh's avatar Leif Walsh Committed by Yoni Fogel

reversing accidental merge

git-svn-id: file:///svn/toku/tokudb@48327 c7de825b-a66e-492c-adef-691d508d4ae1
parent 9ac43905
...@@ -10,18 +10,13 @@ endif () ...@@ -10,18 +10,13 @@ endif ()
## preprocessor definitions we want everywhere ## preprocessor definitions we want everywhere
add_c_defines( add_c_defines(
_SVID_SOURCE
_XOPEN_SOURCE=600
_FILE_OFFSET_BITS=64 _FILE_OFFSET_BITS=64
_LARGEFILE64_SOURCE _LARGEFILE64_SOURCE
__STDC_FORMAT_MACROS __STDC_FORMAT_MACROS
__STDC_LIMIT_MACROS __STDC_LIMIT_MACROS
__LONG_LONG_SUPPORTED
) )
if (NOT CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
add_c_defines(
_SVID_SOURCE
_XOPEN_SOURCE=600
)
endif ()
## add TOKU_PTHREAD_DEBUG for debug builds ## add TOKU_PTHREAD_DEBUG for debug builds
set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_DEBUG TOKU_PTHREAD_DEBUG) set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_DEBUG TOKU_PTHREAD_DEBUG)
...@@ -97,12 +92,6 @@ if (NOT CMAKE_CXX_COMPILER_ID MATCHES Clang) ...@@ -97,12 +92,6 @@ if (NOT CMAKE_CXX_COMPILER_ID MATCHES Clang)
) )
endif () endif ()
if (CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
set_cflags_if_supported(
-Wno-error=unused-but-set-variable
)
endif ()
## this hits with optimized builds somewhere in ftleaf_split, we don't ## this hits with optimized builds somewhere in ftleaf_split, we don't
## know why but we don't think it's a big deal ## know why but we don't think it's a big deal
set_ldflags_if_supported( set_ldflags_if_supported(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment