diff options
| author | Vladislav Vaintroub <vvaintroub@linux-rbsx> | 2010-01-20 00:52:21 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@linux-rbsx> | 2010-01-20 00:52:21 +0100 |
| commit | df2d0359d8c3f1c58d0f442692c92cdabc885a9d (patch) | |
| tree | e73bf16289b6e08db5b2b5c23042b8bf2136af5d /CMakeLists.txt | |
| parent | 83bb5da5864ca4febc9361c2ece94f04434cb6a6 (diff) | |
| download | mariadb-git-df2d0359d8c3f1c58d0f442692c92cdabc885a9d.tar.gz | |
- another take on BUILD_CONFIG variable - use OPTION instead of SET for
boolean variables to ensure option is in cache. Also use documented CMAKE_USE_MAKE_RULES_OVERRIDE feature instead of INCLUDE.
- remove superfluous tests in innobase's CMakeLists.txt
Diffstat (limited to 'CMakeLists.txt')
| -rwxr-xr-x | CMakeLists.txt | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 77cb30a8a40..d2f33bf6571 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -54,12 +54,14 @@ IF(WITH_DEBUG_FULL) SET(WITH_DEBUG ON CACHE BOOL "Use DBUG") ENDIF() -PROJECT(MySQL) - IF(BUILD_CONFIG) - INCLUDE(${CMAKE_SOURCE_DIR}/cmake/build_configurations/${BUILD_CONFIG}.cmake) + SET(CMAKE_USER_MAKE_RULES_OVERRIDE + ${CMAKE_SOURCE_DIR}/cmake/build_configurations/${BUILD_CONFIG}.cmake) ENDIF() +PROJECT(MySQL) + + IF(CYGWIN) SET(WIN32 0) ENDIF() |