diff options
| author | Vladislav Vaintroub <vvaintroub@mysql.com> | 2010-03-08 00:31:06 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@mysql.com> | 2010-03-08 00:31:06 +0100 |
| commit | 402cab754af51997f575bb98d647e5f4fd182f10 (patch) | |
| tree | e9f512ea1962f9969637e7fafdfde5ca7943ee80 | |
| parent | 22f923f2b157285c8f5b834cc8ccc062f70cf601 (diff) | |
| download | mariadb-git-402cab754af51997f575bb98d647e5f4fd182f10.tar.gz | |
Fix typo (CMAKE_SIZEOF_VOIDP=>CMAKE_SIZEOF_VOID_P)
| -rw-r--r-- | cmake/build_configurations/mysql_release.cmake | 4 | ||||
| -rw-r--r-- | cmake/os/Windows.cmake | 4 | ||||
| -rw-r--r-- | storage/innobase/CMakeLists.txt | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/cmake/build_configurations/mysql_release.cmake b/cmake/build_configurations/mysql_release.cmake index 450ef9826c2..b329a09d56e 100644 --- a/cmake/build_configurations/mysql_release.cmake +++ b/cmake/build_configurations/mysql_release.cmake @@ -151,7 +151,7 @@ IF(UNIX) ENDIF() IF(CMAKE_C_COMPILER_ID MATCHES "SunPro") IF(CMAKE_SYSTEM_PROCESSOR MATCHES "i386") - IF(CMAKE_SIZEOF_VOIDP EQUAL 4) + IF(CMAKE_SIZEOF_VOID_P EQUAL 4) # Solaris x86 SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-g -xO2 -mt -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -xlibmil -xlibmopt -xtarget=generic") @@ -165,7 +165,7 @@ IF(UNIX) "-g0 -xO3 -mt -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -features=no%except -xlibmil -xlibmopt -xtarget=generic") ENDIF() ELSE() - IF(CMAKE_SIZEOF_VOIDP EQUAL 4) + IF(CMAKE_SIZEOF_VOID_P EQUAL 4) # Solaris sparc 32 bit SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-g -xO3 -Xa -xstrconst -mt -xarch=sparc") SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-g0 -xO3 -noex -mt -xarch=sparc") diff --git a/cmake/os/Windows.cmake b/cmake/os/Windows.cmake index f610ce9068a..3be739d3122 100644 --- a/cmake/os/Windows.cmake +++ b/cmake/os/Windows.cmake @@ -56,7 +56,7 @@ ADD_DEFINITIONS("-D_WIN32_WINNT=0x0501") ADD_DEFINITIONS("-DWIN32_LEAN_AND_MEAN") # Adjust compiler and linker flags -IF(MINGW AND CMAKE_SIZEOF_VOIDP EQUAL 4) +IF(MINGW AND CMAKE_SIZEOF_VOID_P EQUAL 4) # mininal architecture flags, i486 enables GCC atomics ADD_DEFINITIONS(-march=i486) ENDIF() @@ -193,4 +193,4 @@ IF(NOT HAVE_SIZE_OF_SSIZE_T) SET(ssize_t SSIZE_T) ENDIF() -SET(FN_NO_CASE_SENSE 1)
\ No newline at end of file +SET(FN_NO_CASE_SENSE 1) diff --git a/storage/innobase/CMakeLists.txt b/storage/innobase/CMakeLists.txt index a11007c8472..42f05530d41 100644 --- a/storage/innobase/CMakeLists.txt +++ b/storage/innobase/CMakeLists.txt @@ -196,7 +196,7 @@ ENDIF() # 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 CMAKE_SIZEOF_VOIDP EQUAL 8) +IF (MSVC AND CMAKE_SIZEOF_VOID_P EQUAL 8) SET_SOURCE_FILES_PROPERTIES(mem/mem0mem.c mem/mem0pool.c PROPERTIES COMPILE_FLAGS -Od) ENDIF() |