fixed cmake and compilation

This commit is contained in:
Yehonal
2016-07-28 16:55:20 +02:00
committed by Yehonal
parent 765fad6133
commit 2c6264915e
3 changed files with 6 additions and 6 deletions

View File

@@ -86,10 +86,10 @@ include(src/cmake/showoptions.cmake)
# add modules and dependencies # add modules and dependencies
AZTH_SUBDIRLIST(sub_DIRS "${CMAKE_SOURCE_DIR}/modules" FALSE FALSE) AZTH_SUBDIRLIST(sub_DIRS "${CMAKE_SOURCE_DIR}/modules" FALSE FALSE)
FOREACH(subdir ${sub_DIRS}) 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") if(EXISTS "${subdir}/CMakeLists.txt")
message("Loading module: ${subdir}") message("Loading module: ${subdir_rel}")
add_subdirectory("${subdir}") add_subdirectory("${subdir_rel}")
endif() endif()
ENDFOREACH() ENDFOREACH()

View File

@@ -20,7 +20,7 @@ function configure() {
echo "Build path: $BUILDPATH" echo "Build path: $BUILDPATH"
echo "DEBUG info: $CDEBUG" echo "DEBUG info: $CDEBUG"
echo "Compilation type: $CCTYPE" echo "Compilation type: $CTYPE"
# -DCMAKE_BUILD_TYPE=$CCTYPE disable optimization "slow and huge amount of ram" # -DCMAKE_BUILD_TYPE=$CCTYPE disable optimization "slow and huge amount of ram"
# -DWITH_COREDEBUG=$CDEBUG compiled with debug information # -DWITH_COREDEBUG=$CDEBUG compiled with debug information
@@ -30,7 +30,7 @@ function configure() {
cmake $SRCPATH -DCMAKE_INSTALL_PREFIX=$BINPATH -DCONF_DIR=$CONFDIR -DSERVERS=$CSERVERS \ cmake $SRCPATH -DCMAKE_INSTALL_PREFIX=$BINPATH -DCONF_DIR=$CONFDIR -DSERVERS=$CSERVERS \
-DSCRIPTS=$CSCRIPTS \ -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 -DCMAKE_C_COMPILER=$CCOMPILERC -DCMAKE_CXX_COMPILER=$CCOMPILERCXX
cd $CWD cd $CWD

View File

@@ -32,7 +32,7 @@ CWARNINGS=1
# enable/disable some debug informations ( it's not a debug compilation ) # enable/disable some debug informations ( it's not a debug compilation )
CDEBUG=0 CDEBUG=0
# specify compilation type # specify compilation type
CCTYPE=Release CTYPE=Release
# compile scripts # compile scripts
CSCRIPTS=1 CSCRIPTS=1
# compile server # compile server