diff --git a/CMakeLists.txt b/CMakeLists.txt index 747c3c803..e0be32872 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -86,10 +86,10 @@ include(src/cmake/showoptions.cmake) # add modules and dependencies AZTH_SUBDIRLIST(sub_DIRS "${CMAKE_SOURCE_DIR}/modules" FALSE FALSE) FOREACH(subdir ${sub_DIRS}) - STRING(REGEX REPLACE "^${CMAKE_SOURCE_DIR}/" "" subdir ${subdir}) + STRING(REGEX REPLACE "^${CMAKE_SOURCE_DIR}/" "" subdir_rel ${subdir}) if(EXISTS "${subdir}/CMakeLists.txt") - message("Loading module: ${subdir}") - add_subdirectory("${subdir}") + message("Loading module: ${subdir_rel}") + add_subdirectory("${subdir_rel}") endif() ENDFOREACH() diff --git a/bin/compiler/includes/functions.sh b/bin/compiler/includes/functions.sh index ba268173f..1f30ba756 100644 --- a/bin/compiler/includes/functions.sh +++ b/bin/compiler/includes/functions.sh @@ -20,7 +20,7 @@ function configure() { echo "Build path: $BUILDPATH" echo "DEBUG info: $CDEBUG" - echo "Compilation type: $CCTYPE" + echo "Compilation type: $CTYPE" # -DCMAKE_BUILD_TYPE=$CCTYPE disable optimization "slow and huge amount of ram" # -DWITH_COREDEBUG=$CDEBUG compiled with debug information @@ -30,7 +30,7 @@ function configure() { cmake $SRCPATH -DCMAKE_INSTALL_PREFIX=$BINPATH -DCONF_DIR=$CONFDIR -DSERVERS=$CSERVERS \ -DSCRIPTS=$CSCRIPTS \ - -DTOOLS=$CTOOLS -DUSE_SCRIPTPCH=$CSCRIPTPCH -DUSE_COREPCH=$CCOREPCH -DWITH_COREDEBUG=$CDEBUG -DCMAKE_BUILD_TYPE=$CCTYPE -DWITH_WARNINGS=$CWARNINGS \ + -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 cd $CWD diff --git a/conf/config.sh.dist b/conf/config.sh.dist index 7a011be03..fd59250a4 100644 --- a/conf/config.sh.dist +++ b/conf/config.sh.dist @@ -32,7 +32,7 @@ CWARNINGS=1 # enable/disable some debug informations ( it's not a debug compilation ) CDEBUG=0 # specify compilation type -CCTYPE=Release +CTYPE=Release # compile scripts CSCRIPTS=1 # compile server