wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Move new config to config.h.cmake" 

This reverts commit 2951ebb4e7.
This commit is contained in:
A.J. Beamon 2021-02-08 14:01:02 -08:00
parent be57b70dbb
commit 601a548cfe
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/ConfigureCompiler.cmake
View File

@ -55,6 +55,11 @@ find_package(Threads REQUIRED)
include_directories(${CMAKE_SOURCE_DIR}) include_directories(${CMAKE_SOURCE_DIR})
include_directories(${CMAKE_BINARY_DIR}) include_directories(${CMAKE_BINARY_DIR})
if(WIN32)
add_definitions(-DBOOST_USE_WINDOWS_H)
add_definitions(-DWIN32_LEAN_AND_MEAN)
endif()
if (USE_CCACHE) if (USE_CCACHE)
FIND_PROGRAM(CCACHE_FOUND "ccache") FIND_PROGRAM(CCACHE_FOUND "ccache")
if(CCACHE_FOUND) if(CCACHE_FOUND)
@ -94,6 +99,7 @@ if(WIN32)
string(REGEX REPLACE "/W[0-4]" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") string(REGEX REPLACE "/W[0-4]" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
endif() endif()
add_compile_options(/W0 /EHsc /bigobj $<$<CONFIG:Release>:/Zi> /MP /FC /Gm-) add_compile_options(/W0 /EHsc /bigobj $<$<CONFIG:Release>:/Zi> /MP /FC /Gm-)
add_compile_definitions(NOMINMAX)
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT") set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT")
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
else() else()

3
flow/config.h.cmake
View File

@ -6,13 +6,10 @@
#endif // FDB_RELEASE #endif // FDB_RELEASE
#cmakedefine OPEN_FOR_IDE #cmakedefine OPEN_FOR_IDE
#ifdef WIN32 #ifdef WIN32
# define BOOST_USE_WINDOWS_H
# define WIN32_LEAN_AND_MEAN
# define _WIN32_WINNT ${WINDOWS_TARGET} # define _WIN32_WINNT ${WINDOWS_TARGET}
# define WINVER ${WINDOWS_TARGET} # define WINVER ${WINDOWS_TARGET}
# define NTDDI_VERSION 0x05020000 # define NTDDI_VERSION 0x05020000
# define BOOST_ALL_NO_LIB # define BOOST_ALL_NO_LIB
# define NOMINMAX
#else #else
# cmakedefine USE_ASAN # cmakedefine USE_ASAN
# cmakedefine USE_MSAN # cmakedefine USE_MSAN