diff options
| author | vvaintroub <vvaintroub@w7> | 2010-01-28 14:33:44 +0100 |
|---|---|---|
| committer | vvaintroub <vvaintroub@w7> | 2010-01-28 14:33:44 +0100 |
| commit | aa134fdf990df1528224bbb97114e07568486516 (patch) | |
| tree | 71f01cc8dd97400d9cc4685841834b52430d5761 /CMakeLists.txt | |
| parent | 9632ea7475317a587cabd083164d59c3cfadf009 (diff) | |
| download | mariadb-git-aa134fdf990df1528224bbb97114e07568486516.tar.gz | |
Move WITH_UNITTESTS option up - otherwise it skips plugin unittests
Diffstat (limited to 'CMakeLists.txt')
| -rwxr-xr-x | CMakeLists.txt | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 0c40877d8ee..369e03bf988 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -86,10 +86,6 @@ IF(DEFINED ENV{CPPFLAGS}) ADD_DEFINITIONS($ENV{CPPFLAGS}) ENDIF() -IF(CYGWIN) - SET(WIN32 0) -ENDIF() - # Add macros INCLUDE(character_sets) INCLUDE(zlib) @@ -113,6 +109,7 @@ OPTION(ENABLED_PROFILING "Enable profiling" ON) OPTION(CYBOZU "" OFF) OPTION(BACKUP_TEST "" OFF) OPTION(WITHOUT_SERVER OFF) +OPTION (WITH_UNIT_TESTS "Compile MySQL with unit tests" ON) MARK_AS_ADVANCED(CYBOZU BACKUP_TEST WITHOUT_SERVER DISABLE_SHARED) @@ -223,7 +220,7 @@ ADD_SUBDIRECTORY(regex) ADD_SUBDIRECTORY(mysys) ADD_SUBDIRECTORY(libmysql) -OPTION (WITH_UNIT_TESTS "Compile MySQL with unit tests" ON) + IF(WITH_UNIT_TESTS) ENABLE_TESTING() ENDIF() |