diff --git a/CMakeLists.txt b/CMakeLists.txt index ef9474e1..e735488e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -234,8 +234,8 @@ if(WITH_ORACLE) endif() # Compile tests (default off) -option(WITH_TESTS "build tests" OFF) -if(WITH_TESTS) +option(TEST "build tests" OFF) +if(TEST) include(CTest) add_subdirectory(tests) endif() diff --git a/travis-compile.sh b/travis-compile.sh index f3624ebb..37467226 100755 --- a/travis-compile.sh +++ b/travis-compile.sh @@ -13,7 +13,7 @@ if [[ $TRAVIS_OS_NAME == "linux" && $QT4 == 0 ]]; then fi if [[ $BUILDTYPE == "Debug" ]]; then - cmake .. -DWITH_SERVER=1 -DWITH_TESTS=1 -DCMAKE_BUILD_TYPE=$BUILDTYPE -DWITH_QT4=$QT4 $prefix + cmake .. -DWITH_SERVER=1 -DTEST=1 -DCMAKE_BUILD_TYPE=$BUILDTYPE -DWITH_QT4=$QT4 $prefix make -j2 make test else