feat(CMake): delete EXTRA_LOGS (#6897)

7 files changed, 4 insertions, 38 deletions

diff --git a/.github/workflows/core_build.yml b/.github/workflows/core_build.yml
index 1599e7ae84..40a18ff4d7 100644
--- a/.github/workflows/core_build.yml
+++ b/.github/workflows/core_build.yml
@@ -18,38 +18,30 @@ jobs:
         os: [ubuntu-20.04]
         compiler: [clang]
         modules: [without]
-        extra_logs: [false]
         # we can include specific combinations here
         include:
           - os: ubuntu-20.04
             compiler: clang12
             modules: without
-            extra_logs: true
           - os: ubuntu-20.04
             compiler: clang11
             modules: without
-            extra_logs: false
           - os: ubuntu-18.04
             compiler: clang10
             modules: without
-            extra_logs: false
           - os: ubuntu-18.04
             compiler: gcc8
             modules: without
-            extra_logs: false
           - os: ubuntu-20.04
             compiler: gcc # default in 20.04 is gcc 9
             modules: without
-            extra_logs: false
           - os: ubuntu-20.04
             compiler: gcc10
             modules: without
-            extra_logs: false
     runs-on: ${{ matrix.os }}
-    name: ${{ matrix.os }}-${{ matrix.compiler }}-${{ matrix.modules }}-modules-extra_logs-${{ matrix.extra_logs }}
+    name: ${{ matrix.os }}-${{ matrix.compiler }}-${{ matrix.modules }}-modules
     env:
       COMPILER: ${{ matrix.compiler }}
-      EXTRA_LOGS: ${{ matrix.extra_logs }}
     if: github.repository == 'azerothcore/azerothcore-wotlk'
     steps:
       - uses: actions/checkout@v2
diff --git a/.github/workflows/core_modules_build.yml b/.github/workflows/core_modules_build.yml
index 1195d90631..3ead0f82f4 100644
--- a/.github/workflows/core_modules_build.yml
+++ b/.github/workflows/core_modules_build.yml
@@ -18,12 +18,10 @@ jobs:
         os: [ubuntu-20.04]
         compiler: [clang]
         modules: [with]
-        extra_logs: [false]
     runs-on: ${{ matrix.os }}
-    name: ${{ matrix.os }}-${{ matrix.compiler }}-${{ matrix.modules }}-modules-extra_logs-${{ matrix.extra_logs }}
+    name: ${{ matrix.os }}-${{ matrix.compiler }}-${{ matrix.modules }}-modules
     env:
       COMPILER: ${{ matrix.compiler }}
-      EXTRA_LOGS: ${{ matrix.extra_logs }}
     if: github.repository == 'azerothcore/azerothcore-wotlk'
     steps:
       - uses: actions/checkout@v2
diff --git a/apps/ci/ci-conf.sh b/apps/ci/ci-conf.sh
index f1499de7c3..775dabdacc 100644
--- a/apps/ci/ci-conf.sh
+++ b/apps/ci/ci-conf.sh
@@ -70,9 +70,3 @@ case $COMPILER in
     exit 1
     ;;
 esac
-
-if [[ $EXTRA_LOGS ]]; then
-  echo "CEXTRA_LOGS=1" >> ./conf/config.sh
-else
-  echo "CEXTRA_LOGS=0" >> ./conf/config.sh
-fi
diff --git a/apps/compiler/includes/functions.sh b/apps/compiler/includes/functions.sh
index f3c98e5cff..b028e56c5f 100644
--- a/apps/compiler/includes/functions.sh
+++ b/apps/compiler/includes/functions.sh
@@ -69,7 +69,7 @@ function comp_configure() {
   -DSCRIPTS=$CSCRIPTS \
   -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 -DENABLE_EXTRA_LOGS=$CEXTRA_LOGS "-DDISABLED_AC_MODULES=$CDISABLED_AC_MODULES" $CCUSTOMOPTIONS
+  -DCMAKE_C_COMPILER=$CCOMPILERC -DCMAKE_CXX_COMPILER=$CCOMPILERCXX "-DDISABLED_AC_MODULES=$CDISABLED_AC_MODULES" $CCUSTOMOPTIONS
 
   cd $CWD
 
diff --git a/conf/dist/config.cmake b/conf/dist/config.cmake
index f0fc600866..9c239b2335 100644
--- a/conf/dist/config.cmake
+++ b/conf/dist/config.cmake
@@ -64,9 +64,7 @@ option(WITH_COREDEBUG      "Include additional debug-code in core"
 option(WITH_PERFTOOLS      "Enable compilation with gperftools libraries included"       0)
 option(WITH_MESHEXTRACTOR  "Build meshextractor (alpha)"                                 0)
 option(WITHOUT_GIT         "Disable the GIT testing routines"                            0)
-option(ENABLE_EXTRAS       "Set to 0 to disable extra features optimizing performances"  1)
 option(ENABLE_VMAP_CHECKS  "Enable Checks relative to DisableMgr system on vmap"         1)
-option(ENABLE_EXTRA_LOGS   "Enable extra log functions that can be CPU intensive"        0)
 option(WITH_DYNAMIC_LINKING "Enable dynamic library linking."                            0)
 option(WITH_STRICT_DATABASE_TYPE_CHECKS "Enable strict checking of database field value accessors" 0)
 
diff --git a/conf/dist/config.sh b/conf/dist/config.sh
index 52fbe67162..05cbaaa32e 100644
--- a/conf/dist/config.sh
+++ b/conf/dist/config.sh
@@ -70,15 +70,13 @@ CTOOLS=${CTOOLS:-OFF}
 # use precompiled headers ( fatest compilation but not optimized if you change headers often )
 CSCRIPTPCH=${CSCRIPTPCH:-ON}
 CCOREPCH=${CCOREPCH:-ON}
-# enable/disable extra logs
-CEXTRA_LOGS=0
 
 # Skip specific modules from compilation (cmake reconfigure needed)
 # use semicolon ; to separate modules
 CDISABLED_AC_MODULES=""
 
 # you can add your custom definitions here ( -D )
-# example:  CCUSTOMOPTIONS=" -DWITH_PERFTOOLS=ON -DENABLE_EXTRA_LOGS=ON"
+# example:  CCUSTOMOPTIONS=" -DWITH_PERFTOOLS=ON
 #
 CCUSTOMOPTIONS=${CCUSTOMOPTIONS:-''}
 
diff --git a/src/cmake/showoptions.cmake b/src/cmake/showoptions.cmake
index 31c387214c..b2e4ee88fb 100644
--- a/src/cmake/showoptions.cmake
+++ b/src/cmake/showoptions.cmake
@@ -118,13 +118,6 @@ endif()
 
 # Performance optimization options:
 
-if( ENABLE_EXTRAS )
-  message("* Enable extra features           : Yes (default)")
-  add_definitions(-DENABLE_EXTRAS)
-else()
-  message("* Enable extra features           : No")
-endif()
-
 if( ENABLE_VMAP_CHECKS )
   message("* Enable vmap DisableMgr checks   : Yes (default)")
   add_definitions(-DENABLE_VMAP_CHECKS)
@@ -132,13 +125,6 @@ else()
   message("* Enable vmap DisableMgr checks   : No")
 endif()
 
-if( ENABLE_EXTRA_LOGS )
-  message("* Enable extra logging functions  : Yes")
-  add_definitions(-DENABLE_EXTRA_LOGS)
-else()
-  message("* Enable extra logging functions  : No (default)")
-endif()
-
 if(WIN32)
   if(NOT WITH_SOURCE_TREE STREQUAL "no")
   message("* Show source tree                : Yes - \"${WITH_SOURCE_TREE}\"")