From aa134fdf990df1528224bbb97114e07568486516 Mon Sep 17 00:00:00 2001 From: vvaintroub Date: Thu, 28 Jan 2010 14:33:44 +0100 Subject: [PATCH] Move WITH_UNITTESTS option up - otherwise it skips plugin unittests --- CMakeLists.txt | 7 ++----- 1 file 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()