diff options
| author | Guilhem Bichot <guilhem@mysql.com> | 2009-08-07 22:52:10 +0200 |
|---|---|---|
| committer | Guilhem Bichot <guilhem@mysql.com> | 2009-08-07 22:52:10 +0200 |
| commit | 412e14a72aaa4abf5790090d13409d636a15772d (patch) | |
| tree | 66992fc7647eaebac6b9b6165dd9240c7669a7ef /storage/innobase | |
| parent | b0dec55b5b222278f72d52dfc85181415ac5cc31 (diff) | |
| download | mariadb-git-412e14a72aaa4abf5790090d13409d636a15772d.tar.gz | |
small cmake fix for Windows build
storage/innobase/CMakeLists.txt:
${WIN64} fails if variable is undefined
Diffstat (limited to 'storage/innobase')
| -rw-r--r-- | storage/innobase/CMakeLists.txt | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/storage/innobase/CMakeLists.txt b/storage/innobase/CMakeLists.txt index 7f24737ed49..f4d8e7b8231 100644 --- a/storage/innobase/CMakeLists.txt +++ b/storage/innobase/CMakeLists.txt @@ -22,9 +22,6 @@ SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX") SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX") INCLUDE("${PROJECT_SOURCE_DIR}/storage/mysql_storage_engine.cmake") -IF (CMAKE_SIZEOF_VOID_P MATCHES 8) - SET(WIN64 TRUE) -ENDIF (CMAKE_SIZEOF_VOID_P MATCHES 8) # Include directories under innobase INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/storage/innobase/include @@ -39,10 +36,10 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include # Removing compiler optimizations for innodb/mem/* files on 64-bit Windows # due to 64-bit compiler error, See MySQL Bug #19424, #36366, #34297 -IF(MSVC AND ${WIN64}) +IF(MSVC AND CMAKE_SIZEOF_VOID_P MATCHES 8) SET_SOURCE_FILES_PROPERTIES(mem/mem0mem.c mem/mem0pool.c PROPERTIES COMPILE_FLAGS -Od) -ENDIF(MSVC AND ${WIN64}) +ENDIF(MSVC AND CMAKE_SIZEOF_VOID_P MATCHES 8) SET(INNOBASE_SOURCES btr/btr0btr.c btr/btr0cur.c btr/btr0pcur.c btr/btr0sea.c buf/buf0buddy.c buf/buf0buf.c buf/buf0flu.c buf/buf0lru.c buf/buf0rea.c |