diff options
Diffstat (limited to 'Config')
| -rwxr-xr-x | Config | 48 |
1 files changed, 7 insertions, 41 deletions
@@ -2,7 +2,7 @@ # # Configuration script for Services. # -# Anope (c) 2003-2016 Anope Team +# Anope (c) 2003-2014 Anope Team # Contact us at team@anope.org # # This program is free but copyrighted software; see the file COPYING for @@ -42,10 +42,9 @@ Run_Build_System () { WITH_PERM="" EXTRA_INCLUDE="" EXTRA_LIBS="" - GEN_TYPE="" if [ "$INSTDIR" != "" ] ; then - WITH_INST="-DINSTDIR:STRING=$INSTDIR" + WITH_INST="-DCMAKE_INSTALL_PREFIX:STRING=$INSTDIR" fi if [ "$RUNGROUP" != "" ] ; then @@ -57,15 +56,9 @@ Run_Build_System () { fi if [ "$DEBUG" = "yes" ] ; then - BUILD_TYPE="-DCMAKE_BUILD_TYPE:STRING=DEBUG" + BUILD_TYPE="-DCMAKE_BUILD_TYPE:STRING=DEBUG -Wdev" else - BUILD_TYPE="-DCMAKE_BUILD_TYPE:STRING=RELEASE" - fi - - if [ "$USE_PCH" = "yes" ] ; then - PCH="-DUSE_PCH:BOOLEAN=ON" - else - PCH="-DUSE_PCH:BOOLEAN=OFF" + BUILD_TYPE="-DCMAKE_BUILD_TYPE:STRING=RELEASE -Wno-dev" fi if [ "$EXTRA_INCLUDE_DIRS" != "" ] ; then @@ -76,12 +69,6 @@ Run_Build_System () { EXTRA_LIBS="-DEXTRA_LIBS:STRING=$EXTRA_LIB_DIRS" fi - case `uname -s` in - MINGW*) - GEN_TYPE="-G\"MSYS Makefiles\"" - ;; - esac - if [ "$SOURCE_DIR" = "." ] ; then pwdsave=`pwd` test -d build || mkdir build @@ -91,9 +78,9 @@ Run_Build_System () { REAL_SOURCE_DIR="$SOURCE_DIR" fi - echo "cmake $GEN_TYPE $WITH_INST $WITH_RUN $WITH_PERM $BUILD_TYPE $PCH $EXTRA_INCLUDE $EXTRA_LIBS $EXTRA_CONFIG_ARGS $REAL_SOURCE_DIR" + echo "cmake $WITH_INST $WITH_RUN $WITH_PERM $BUILD_TYPE $EXTRA_INCLUDE $EXTRA_LIBS $EXTRA_CONFIG_ARGS $REAL_SOURCE_DIR" - cmake $GEN_TYPE $WITH_INST $WITH_RUN $WITH_PERM $BUILD_TYPE $PCH $EXTRA_INCLUDE $EXTRA_LIBS $EXTRA_CONFIG_ARGS $REAL_SOURCE_DIR + cmake $WITH_INST $WITH_RUN $WITH_PERM $BUILD_TYPE $EXTRA_INCLUDE $EXTRA_LIBS $EXTRA_CONFIG_ARGS $REAL_SOURCE_DIR if [ $? -ne 0 ]; then echo "You should fix these issues and then run ./Config -quick to rerun CMake." exit 1 @@ -125,11 +112,10 @@ export ECHO2 ECHO2SUF # Init values ########################################################################### -INSTDIR=$HOME/services +INSTDIR=$HOME/anope RUNGROUP= UMASK= DEBUG="no" -USE_PCH="no" EXTRA_INCLUDE_DIRS= EXTRA_LIB_DIRS= EXTRA_CONFIG_ARGS= @@ -318,25 +304,6 @@ echo "" #### -TEMP_YN="n" -if [ "$USE_PCH" = "yes" ] ; then - TEMP_YN="y" -fi -echo "Do you want to build using precompiled headers? This can speed up" -echo "the build, but uses more disk space." -echo2 "[$TEMP_YN] " -read YN -if [ "$YN" ] ; then - if [ "$YN" = "y" ] ; then - USE_PCH="yes" - else - USE_PCH="no" - fi -fi -echo "" - -#### - echo "Are there any extra include directories you wish to use?" echo "You may only need to do this if CMake is unable to locate" echo "missing dependencies without hints." @@ -399,7 +366,6 @@ INSTDIR="$INSTDIR" RUNGROUP="$RUNGROUP" UMASK=$UMASK DEBUG="$DEBUG" -USE_PCH="$USE_PCH" EXTRA_INCLUDE_DIRS="$EXTRA_INCLUDE_DIRS" EXTRA_LIB_DIRS="$EXTRA_LIB_DIRS" EXTRA_CONFIG_ARGS="$EXTRA_CONFIG_ARGS" |