Mercurial > sumwars

changeset 2691:bd1a2ea1c22f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged with changes from remote.
author Augustin Preda
date Wed, 26 Mar 2014 23:39:47 +0200
parents 2972b4ab3cef (current diff) a5d16df6b8b6 (diff)
children d804c37df847 d964db0e220d
files
diffstat 1 files changed, 3 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/CMakeLists.txt	Wed Mar 26 23:39:02 2014 +0200
+++ b/CMakeLists.txt	Wed Mar 26 23:39:47 2014 +0200
@@ -22,7 +22,7 @@
 
 OPTION(SUMWARS_NO_TINYXML "Do not use bundled, in-source TinyXML Lib" OFF)
 OPTION(SUMWARS_NO_ENET "Do not use bundled, in-source ENET Lib" OFF)
-OPTION(SUMWARS_BUILD_TOOLS "Builds editor tools (not needed for gameplay, only useful for content authors)" ON)
+OPTION(SUMWARS_BUILD_TOOLS "Builds editor tools (not needed for gameplay, only useful for content authors)" OFF)
 OPTION(SUMWARS_BUILD_WITH_ONLINE_SERVICE "Builds enables the online services)" OFF)
 OPTION(SUMWARS_UPDATE_HG_REVISION "Option to enable or disable automatic revision checking" ON)
 IF(WIN32)
@@ -181,11 +181,10 @@
 FIND_PACKAGE(OIS REQUIRED)
 FIND_PACKAGE(Lua REQUIRED)
 FIND_PACKAGE(CEGUI REQUIRED)
+SET(CEGUI_VERSION_RESOURCES "gui_0.8")
 
 IF(CEGUI_VERSION VERSION_LESS "0.8.0")
-	SET(CEGUI_VERSION_RESOURCES "gui")
-ELSE()
-	SET(CEGUI_VERSION_RESOURCES "gui_0.8")
+	MESSAGE(FATAL_ERROR "This version of Sumwars requires at least CEGUI 0.8.0")
 ENDIF()
 
 FIND_PACKAGE(CEGUIOGRE REQUIRED)