diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | apps/ci/ci-install.sh | 2 | ||||
| -rwxr-xr-x | apps/ci/mac/ci-compile.sh | 2 | ||||
| -rw-r--r-- | apps/compiler/includes/functions.sh | 2 | ||||
| -rw-r--r-- | conf/dist/config.cmake | 2 | ||||
| -rw-r--r-- | conf/dist/config.sh | 2 | ||||
| -rw-r--r-- | src/cmake/showoptions.cmake | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7473c64661..1959754a34 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -142,7 +142,7 @@ add_subdirectory(src) CU_RUN_HOOK("AFTER_SRC_LOAD") -if( UNIT_TESTS ) +if( BUILD_TESTING ) # we use these flags to get code coverage set(UNIT_TEST_CXX_FLAGS "-fprofile-arcs -ftest-coverage -fno-inline") diff --git a/apps/ci/ci-install.sh b/apps/ci/ci-install.sh index bce9a9acf1..99f267c50f 100755 --- a/apps/ci/ci-install.sh +++ b/apps/ci/ci-install.sh @@ -8,7 +8,7 @@ CWARNINGS=ON CDEBUG=OFF CTYPE=Release CSCRIPTS=ON -CUNIT_TESTS=ON +CBUILD_TESTING=ON CSERVERS=ON CTOOLS=ON CSCRIPTPCH=OFF diff --git a/apps/ci/mac/ci-compile.sh b/apps/ci/mac/ci-compile.sh index b49cc413b9..7f10ae8b52 100755 --- a/apps/ci/mac/ci-compile.sh +++ b/apps/ci/mac/ci-compile.sh @@ -9,7 +9,7 @@ mkdir var/build/obj && cd var/build/obj; time cmake ../../../ \ -DTOOLS=1 \ --DUNIT_TESTS=1 \ +-DBUILD_TESTING=1 \ -DSCRIPTS=1 \ -DCMAKE_BUILD_TYPE=Debug \ -DMYSQL_ADD_INCLUDE_PATH=/usr/local/include \ diff --git a/apps/compiler/includes/functions.sh b/apps/compiler/includes/functions.sh index ff25375357..6c1a842dde 100644 --- a/apps/compiler/includes/functions.sh +++ b/apps/compiler/includes/functions.sh @@ -35,7 +35,7 @@ function comp_configure() { cmake $SRCPATH -DCMAKE_INSTALL_PREFIX=$BINPATH $DCONF -DSERVERS=$CSERVERS \ -DSCRIPTS=$CSCRIPTS \ - -DUNIT_TESTS=$CUNIT_TESTS \ + -DBUILD_TESTING=$CBUILD_TESTING \ -DTOOLS=$CTOOLS -DUSE_SCRIPTPCH=$CSCRIPTPCH -DUSE_COREPCH=$CCOREPCH -DWITH_COREDEBUG=$CDEBUG -DCMAKE_BUILD_TYPE=$CTYPE -DWITH_WARNINGS=$CWARNINGS \ -DCMAKE_C_COMPILER=$CCOMPILERC -DCMAKE_CXX_COMPILER=$CCOMPILERCXX "-DDISABLED_AC_MODULES=$CDISABLED_AC_MODULES" $CCUSTOMOPTIONS diff --git a/conf/dist/config.cmake b/conf/dist/config.cmake index dd6abcbd25..3b2000b638 100644 --- a/conf/dist/config.cmake +++ b/conf/dist/config.cmake @@ -1,6 +1,6 @@ option(SERVERS "Build worldserver and authserver" 1) option(SCRIPTS "Build core with scripts included" 1) -option(UNIT_TESTS "Build unit tests" 0) +option(BUILD_TESTING "Build unit tests" 0) option(TOOLS "Build map/vmap/mmap extraction/assembler tools" 0) option(USE_SCRIPTPCH "Use precompiled headers when compiling scripts" 1) option(USE_COREPCH "Use precompiled headers when compiling servers" 1) diff --git a/conf/dist/config.sh b/conf/dist/config.sh index 9d6492d6df..7bdd13f949 100644 --- a/conf/dist/config.sh +++ b/conf/dist/config.sh @@ -48,7 +48,7 @@ CTYPE=Release # compile scripts CSCRIPTS=ON # compile unit tests -CUNIT_TESTS=OFF +CBUILD_TESTING=OFF # compile server CSERVERS=ON # compile tools diff --git a/src/cmake/showoptions.cmake b/src/cmake/showoptions.cmake index f5fb5c4e19..7ecae8c8a0 100644 --- a/src/cmake/showoptions.cmake +++ b/src/cmake/showoptions.cmake @@ -40,7 +40,7 @@ else() message("* Build map/vmap tools : No (default)") endif() -if( UNIT_TESTS ) +if( BUILD_TESTING ) message("* Build unit tests : Yes") else() message("* Build unit tests : No (default)") |