mirror of
https://github.com/mod-playerbots/azerothcore-wotlk.git
synced 2025-11-29 17:38:24 +08:00
feat(CMake): delete EXTRA_LOGS (#6897)
This commit is contained in:
10
.github/workflows/core_build.yml
vendored
10
.github/workflows/core_build.yml
vendored
@@ -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
|
||||
|
||||
4
.github/workflows/core_modules_build.yml
vendored
4
.github/workflows/core_modules_build.yml
vendored
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
2
conf/dist/config.cmake
vendored
2
conf/dist/config.cmake
vendored
@@ -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)
|
||||
|
||||
|
||||
4
conf/dist/config.sh
vendored
4
conf/dist/config.sh
vendored
@@ -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:-''}
|
||||
|
||||
|
||||
@@ -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}\"")
|
||||
|
||||
Reference in New Issue
Block a user