diff options
| author | vvaintroub <vvaintroub@xp> | 2010-01-29 03:07:00 +0100 |
|---|---|---|
| committer | vvaintroub <vvaintroub@xp> | 2010-01-29 03:07:00 +0100 |
| commit | f719e51f8b317137fc7f380d290b4379d24aad06 (patch) | |
| tree | a9f1b1d75a2a9c07a9e64b00dced3c3ddd5a03ab /cmake/os/Windows.cmake | |
| parent | 051f769dc5352136f084670009b5f8f0b0d68592 (diff) | |
| download | mariadb-git-f719e51f8b317137fc7f380d290b4379d24aad06.tar.gz | |
Add windows system check cache that prevents tests from running, most are irrelevant anyway
Add cached variable WITH_XXX_STORAGE_ENGINE for dynamic plugins that can be static or
dynamic.
Diffstat (limited to 'cmake/os/Windows.cmake')
| -rw-r--r-- | cmake/os/Windows.cmake | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/cmake/os/Windows.cmake b/cmake/os/Windows.cmake index ce82575ef76..f1f483dfb33 100644 --- a/cmake/os/Windows.cmake +++ b/cmake/os/Windows.cmake @@ -27,7 +27,14 @@ INCLUDE (CheckTypeSize) # Optionally read user configuration, generated by configure.js. # This is left for backward compatibility reasons only. -INCLUDE(win/configure.data OPTIONAL) +INCLUDE(${CMAKE_BINARY_DIR}/win/configure.data OPTIONAL) + +# avoid running system checks by using pre-cached check results +# system checks are expensive on VS since every tiny program is to be compiled in +# a VC solution. +GET_FILENAME_COMPONENT(_SCRIPT_DIR ${CMAKE_CURRENT_LIST_FILE} PATH) +INCLUDE(${_SCRIPT_DIR}/WindowsCache.cmake) + # OS display name (version_compile_os etc). # Used by the test suite to ignore bugs on some platforms, @@ -97,8 +104,8 @@ IF(MSVC) ENDIF() #TODO: update the code and remove the disabled warnings + ADD_DEFINITIONS(/wd4800 /wd4805) IF (MSVC_VERSION GREATER 1310) - ADD_DEFINITIONS(/wd4800 /wd4805) ADD_DEFINITIONS(/wd4996) ENDIF() @@ -179,6 +186,7 @@ CHECK_FUNCTION_REPLACEMENT(snprintf _snprintf) CHECK_FUNCTION_REPLACEMENT(strtok_r strtok_s) CHECK_FUNCTION_REPLACEMENT(strtoll _strtoi64) CHECK_FUNCTION_REPLACEMENT(strtoull _strtoui64) +CHECK_FUNCTION_REPLACEMENT(vsnprintf _vsnprintf) CHECK_TYPE_SIZE(ssize_t SIZE_OF_SSIZE_T) IF(NOT HAVE_SIZE_OF_SSIZE_T) SET(ssize_t SSIZE_T) |