aboutsummaryrefslogtreecommitdiff
path: root/cmake/showoptions.cmake
diff options
context:
space:
mode:
authorNaios <naios-dev@live.de>2016-03-24 18:19:56 +0100
committerNaios <naios-dev@live.de>2016-04-11 21:13:58 +0200
commit848b8a4136a4b395bfab74899520c74812d7f08e (patch)
tree57ef803918b2527894cdc423825258f1808525c5 /cmake/showoptions.cmake
parent4710b1c8fe89e6cdd98f1a4645edd93d05033fa7 (diff)
Core/Scripts: Split script subdirectories into independent modules
* Makes it possible to define the linkage for every module * Move the ScriptPCH into the root directory * Changes the SCRIPTS cmake variable to a string type: -> -DSCRIPTS=0 is -DSCRIPTS="minimal-static" now (builds commands and spells statically) -> -DSCRIPTS=1 is -DSCRIPTS="static" now (builds all modules statically) -> -DSCRIPTS="dynamic" (builds all modules dynamically) -> Also the default value which is provided by the SCRIPTS variable is overwriteable through the SCRIPTS_COMMANDS, SCRIPTS_SPELLS... variable.
Diffstat (limited to 'cmake/showoptions.cmake')
-rw-r--r--cmake/showoptions.cmake18
1 files changed, 9 insertions, 9 deletions
diff --git a/cmake/showoptions.cmake b/cmake/showoptions.cmake
index b485cfe5ce6..27ffe0578ef 100644
--- a/cmake/showoptions.cmake
+++ b/cmake/showoptions.cmake
@@ -23,9 +23,8 @@ else()
message("* Build world/bnetserver : No")
endif()
-if( SCRIPTS )
- message("* Build with scripts : Yes (default)")
- add_definitions(-DSCRIPTS)
+if(SCRIPTS AND (NOT SCRIPTS STREQUAL "none"))
+ message("* Build with scripts : Yes (${SCRIPTS})")
else()
message("* Build with scripts : No")
endif()
@@ -70,7 +69,7 @@ else()
endif()
if( NOT WITH_SOURCE_TREE STREQUAL "no" )
- message("* Show source tree : Yes - \"${WITH_SOURCE_TREE}\"")
+ message("* Show source tree : Yes (${WITH_SOURCE_TREE})")
else()
message("* Show source tree : No")
endif()
@@ -87,7 +86,7 @@ if ( WITHOUT_GIT )
message(" *** version of git for the revision-hash to work, and be allowede to ask for")
message(" *** support if needed.")
else()
- message("* Use GIT revision hash : Yes")
+ message("* Use GIT revision hash : Yes (default)")
endif()
if ( NOJEM )
@@ -113,15 +112,16 @@ if ( HELGRIND )
add_definitions(-DHELGRIND)
endif()
-if (WITH_DYNAMIC_LINKING)
+if (BUILD_SHARED_LIBS)
message("")
message(" *** WITH_DYNAMIC_LINKING - INFO!")
message(" *** Will link against shared libraries!")
message(" *** Please note that this is an experimental feature!")
+ if (WITH_DYNAMIC_LINKING_FORCED)
+ message("")
+ message(" *** Dynamic linking was enforced through a dynamic script module!")
+ endif()
add_definitions(-DTRINITY_API_USE_DYNAMIC_LINKING)
- set(BUILD_SHARED_LIBS ON)
-else()
- set(BUILD_SHARED_LIBS OFF)
endif()
message("")