Changeset 1776 for code/trunk/CMakeLists.txt

Timestamp:

Sep 13, 2008, 9:32:44 PM (16 years ago)

Author:

landauf

Message:

Many changes in almost all FindXYZ.cmake files. They now throw errors if something wasn't found.

File:

• code/trunk/CMakeLists.txt (modified) (8 diffs)

code/trunk/CMakeLists.txt

@@ -3 +3 @@
 cmake_minimum_required(VERSION 2.4)
 
-if(COMMAND cmake_policy)
+IF (COMMAND cmake_policy)
   cmake_policy(SET CMP0003 NEW)
-endif(COMMAND cmake_policy)
+ENDIF (COMMAND cmake_policy)
 
-#This sets where to look for modules (e.g. "Find*.cmake" files)
+# This sets where to look for modules (e.g. "Find*.cmake" files)
 SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 
-#Check whether we are on a tardis box
+# Check whether we are on a tardis box
 INCLUDE(CheckTardis)
 
@@ -21 +21 @@
 ENDIF(TESTING_ENABLED)
 
-OPTION(NETWORK_TESTING_ENABLED "Do you want to build network testing tools: i.e. chatclient chatserver and alike")
-OPTION(NETWORKTRAFFIC_TESTING_ENABLED "Do you want to build dummyserver4 and dummyclient4")
+OPTION (NETWORK_TESTING_ENABLED "Do you want to build network testing tools: i.e. chatclient chatserver and alike")
+OPTION (NETWORKTRAFFIC_TESTING_ENABLED "Do you want to build dummyserver4 and dummyclient4")
 
 
@@ -30 +30 @@
 IF(IS_TARDIS)
   MESSAGE("System is a TARDIS: Setting Compiler to g++-4.1.1")
-  # force-set the compiler on tardis machines, as default points to g++-3.3
+  # Force-set the compiler on tardis machines, as default points to g++-3.3
   SET(CMAKE_CXX_COMPILER "g++-4.1.1")
-  # reset Boost serach path
+  # Reset Boost serach path
   SET(Boost_INCLUDE_DIR "/usr/pack/boost-1.34.1-sd/i686-debian-linux3.1/include")
 ELSE (IS_TARDIS)
-  SET(Boost_INCLUDE_DIR "/usr/include/boost")
+  IF (NOT WIN32)
+    SET(Boost_INCLUDE_DIR "/usr/include/boost")
+  ENDIF (NOT WIN32)
 ENDIF(IS_TARDIS)
 
-#set binary output directories
+# Set binary output directories
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
 SET(LIBRARY_OUTPUT_PATH    ${PROJECT_SOURCE_DIR}/bin/lib)
 
-# global compiler/linker flags. force -O2!
+# Global compiler/linker flags. force -O2!
 SET(CMAKE_C_FLAGS "$ENV{CFLAGS} -O0 -Wall -g -ggdb")
 SET(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} -O0 -Wall -g -ggdb")
@@ -53 +55 @@
 SET(CMAKE_MODULE_LINKER_FLAGS " --no-undefined")
 
-#use 'cmake -D make_verb:1 path' to get verbose make output when compiling
+# Use 'cmake -D make_verb:1 path' to get verbose make output when compiling
 IF (MAKE_VERB)
  SET(CMAKE_VERBOSE_MAKEFILE TRUE)
@@ -61 +63 @@
 ############### Library finding #################
 
-#Performs the search and sets the variables
+# Uncomment the following line if you want the include and library paths to be shown
+# Alternatively use the "-D VERBOSE_FIND:BOOL=true" option when executing cmake
+
+# SET (VERBOSE_FIND true)
+
+# Performs the search and sets the variables
 FIND_PACKAGE(OGRE)
 FIND_PACKAGE(CEGUI)
@@ -75 +82 @@
 FIND_PACKAGE(DirectX)
 
-#Set the search paths for the linking
+# Set the search paths for the linking
 LINK_DIRECTORIES(
   ${OGRE_LIB_DIR}
-  ${CEGUI_LIB_DIR} # ${CEGUI_OGRE_LIB_DIR}
+  ${CEGUI_LIB_DIR}
+  ${CEGUI_SCRIPT_LIB_DIR}
+#  ${CEGUI_OGRE_LIB_DIR}
   ${ENet_LIBRARY}
   ${Boost_LIBRARY_DIRS}
@@ -85 +94 @@
 )
 
-#Set the search paths for include files
+# Set the search paths for include files
 INCLUDE_DIRECTORIES(
   ${OGRE_INCLUDE_DIR}
-  ${CEGUI_INCLUDE_DIR} # ${CEGUI_OGRE_INCLUDE_DIR}
+  ${CEGUI_INCLUDE_DIR}
+#  ${CEGUI_OGRE_INCLUDE_DIR}
   ${ENet_INCLUDE_DIR}
   ${Boost_INCLUDE_DIRS}
@@ -101 +111 @@
 )
 
-#add main source dir
+# Add main source dir
 ADD_SUBDIRECTORY(src)