diff options
author | click <none@none> | 2010-08-28 21:51:28 +0200 |
---|---|---|
committer | click <none@none> | 2010-08-28 21:51:28 +0200 |
commit | cf841c8337ecc24270d9d633f79f3d4f4f0d75a4 (patch) | |
tree | 84b4fb3905d1d44a8e7ba3a2525a60149046d912 | |
parent | 3fa20f4cf340e9f28e450ba388b16f7849f07d11 (diff) |
Buildsystem: Split out the resultlist from the options, and print it AFTER we've grabbed all the settings
--HG--
branch : trunk
-rw-r--r-- | CMakeLists.txt | 3 | ||||
-rw-r--r-- | cmake/options.cmake | 80 | ||||
-rw-r--r-- | cmake/showoptions.cmake | 80 |
3 files changed, 83 insertions, 80 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5fece05a377..ab620e9d9ae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -61,6 +61,9 @@ execute_process( OUTPUT_VARIABLE HG_REVISION ) +# print out the results before continuing +include(cmake/showoptions.cmake) + # add and generate revision.h add_subdirectory(src/genrevision) diff --git a/cmake/options.cmake b/cmake/options.cmake index 270091432f0..5a580eff290 100644 --- a/cmake/options.cmake +++ b/cmake/options.cmake @@ -17,83 +17,3 @@ option(USE_SFMT "Use SFMT as random numbergenerator" 0) option(WITH_WARNINGS "Show all warnings during compile" 1) option(WITH_COREDEBUG "Include additional debug-code in core" 0) option(WITH_SQL "Copy SQL files during installation" 0) - -# output generic information about the core and buildtype chosen - -message("") -message("* TrinityCore revision : ${HG_REVISION}") -if( UNIX ) - message("* Build binaries in : ${CMAKE_BUILD_TYPE} mode") -endif() -message("") - -# output information about installation-directories and locations - -message("* Install core to : ${CMAKE_INSTALL_PREFIX}") -if( UNIX ) - message("* Install libraries to : ${LIBSDIR}") - message("* Install configs to : ${CONF_DIR}") -endif() -message("") - -# Show infomation about the options selected during configuration - -if( SERVERS ) - message("* Build world/auth : Yes (default)") -else() - message("* Build world/authserver : No") -endif() - -if( SCRIPTS ) - message("* Build with scripts : Yes (default)") - add_definitions(-DSCRIPTS) -else() - message("* Build with scripts : No") - set(USE_SCRIPTPCH 0) -endif() - -if( TOOLS ) - message("* Build map/vmap tools : Yes") -else() - message("* Build map/vmap tools : No (default)") -endif() - -if( WITH_SQL ) - message("* Install SQL-files : Yes") -else() - message("* Install SQL-files : No (default)") -endif() - -if( USE_COREPCH ) - message("* Build core w/PCH : Yes (default)") -else() - message("* Build core w/PCH : No") -endif() - -if( USE_SCRIPTPCH ) - message("* Build scripts w/PCH : Yes (default)") -else() - message("* Build scripts w/PCH : No") -endif() - -if( USE_SFMT ) - message("* Use SFMT for RNG : Yes") - add_definitions(-DUSE_SFMT_FOR_RNG) -else() - message("* Use SFMT for RNG : No (default)") -endif() - -if( WITH_WARNINGS ) - message("* Show all warnings : Yes") -else() - message("* Show compile-warnings : No (default)") -endif() - -if( WITH_COREDEBUG ) - message("* Use coreside debug : Yes") - add_definitions(-DTRINITY_DEBUG) -else() - message("* Use coreside debug : No (default)") -endif() - -message("") diff --git a/cmake/showoptions.cmake b/cmake/showoptions.cmake new file mode 100644 index 00000000000..00b1921cc38 --- /dev/null +++ b/cmake/showoptions.cmake @@ -0,0 +1,80 @@ +# output generic information about the core and buildtype chosen + +message("") +message("* TrinityCore revision : ${HG_REVISION}") +if( UNIX ) + message("* Build binaries in : ${CMAKE_BUILD_TYPE} mode") +endif() +message("") + +# output information about installation-directories and locations + +message("* Install core to : ${CMAKE_INSTALL_PREFIX}") +if( UNIX ) + message("* Install libraries to : ${LIBSDIR}") + message("* Install configs to : ${CONF_DIR}") +endif() +message("") + +# Show infomation about the options selected during configuration + +if( SERVERS ) + message("* Build world/auth : Yes (default)") +else() + message("* Build world/authserver : No") +endif() + +if( SCRIPTS ) + message("* Build with scripts : Yes (default)") + add_definitions(-DSCRIPTS) +else() + message("* Build with scripts : No") + set(USE_SCRIPTPCH 0) +endif() + +if( TOOLS ) + message("* Build map/vmap tools : Yes") +else() + message("* Build map/vmap tools : No (default)") +endif() + +if( WITH_SQL ) + message("* Install SQL-files : Yes") +else() + message("* Install SQL-files : No (default)") +endif() + +if( USE_COREPCH ) + message("* Build core w/PCH : Yes (default)") +else() + message("* Build core w/PCH : No") +endif() + +if( USE_SCRIPTPCH ) + message("* Build scripts w/PCH : Yes (default)") +else() + message("* Build scripts w/PCH : No") +endif() + +if( USE_SFMT ) + message("* Use SFMT for RNG : Yes") + add_definitions(-DUSE_SFMT_FOR_RNG) +else() + message("* Use SFMT for RNG : No (default)") +endif() + +if( WITH_WARNINGS ) + message("* Show all warnings : Yes") +else() + message("* Show compile-warnings : No (default)") +endif() + +if( WITH_COREDEBUG ) + message("* Use coreside debug : Yes") + add_definitions(-DTRINITY_DEBUG) +else() + message("* Use coreside debug : No (default)") +endif() + +message("") + |