diff options
| author | Yehonal <hw.2@hotmail.it> | 2016-07-28 16:55:20 +0200 |
|---|---|---|
| committer | Yehonal <yehonal.azeroth@gmail.com> | 2016-08-07 12:11:23 +0200 |
| commit | 2c6264915e6c81ab10356f021d39c0c85f7eeffe (patch) | |
| tree | d2f2bdf434db59b22a40e7209c2a907f7e14d9be | |
| parent | 765fad6133aa07832282d3c389e31afd7f10c210 (diff) | |
fixed cmake and compilation
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | bin/compiler/includes/functions.sh | 4 | ||||
| -rw-r--r-- | conf/config.sh.dist | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 747c3c803c..e0be328721 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 ba268173fb..1f30ba7561 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 7a011be031..fd59250a4e 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 |