Commit bd4b896a authored by Mikael Ronstrom's avatar Mikael Ronstrom

Preparation for using CMake for more than Windows by only checking for WIN_ATOMICS32/64 on Windows

parent eed527ad
......@@ -25,7 +25,8 @@ IF(CMAKE_GENERATOR MATCHES "Visual Studio" AND CMAKE_SIZEOF_VOID_P MATCHES 8)
PROPERTIES COMPILE_FLAGS -Od)
ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio" AND CMAKE_SIZEOF_VOID_P MATCHES 8)
IF (NOT WITHOUT_ATOMICS)
IF (WIN32)
IF (NOT WITHOUT_ATOMICS)
# Check if this Windows version supports atomic instructions
IF (CMAKE_SIZEOF_VOID_P MATCHES 8)
# Check for 64 bit atomics
......@@ -44,8 +45,8 @@ IF (NOT WITHOUT_ATOMICS)
ADD_DEFINITIONS(-DWIN_ATOMICS32)
ENDIF (COMPILE_RES AND NOT RUN_RES)
ENDIF (CMAKE_SIZEOF_VOID_P MATCHES 8)
ENDIF (NOT WITHOUT_ATOMICS)
ENDIF (NOT WITHOUT_ATOMICS)
ENDIF (WIN32)
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/zlib
${CMAKE_SOURCE_DIR}/storage/innobase/include
${CMAKE_SOURCE_DIR}/storage/innobase/handler
......
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