Changeset 2583 for code/branches/buildsystem2/src/CMakeLists.txt

Timestamp:

Jan 12, 2009, 1:33:55 PM (17 years ago)

Author:

rgrieder

Message:

• Use $ENV{BOOST_ROOT} to find boost if possible
• Set TOLUA_PARSER_WORKING_DIRECTORY now defaults to ${CMAKE_RUNTIME_OUTPUT_PATH}
• Added bin/release, bin/debug, release and debug to the Ogre library prefix paths
• Lots of small fixes and changes

File:

• code/branches/buildsystem2/src/CMakeLists.txt (modified) (4 diffs)

code/branches/buildsystem2/src/CMakeLists.txt

@@ -3 +3 @@
   ${OGRE_INCLUDE_DIR}
   ${CEGUI_INCLUDE_DIR}
-  ${ENet_INCLUDE_DIR}
+  ${ENET_INCLUDE_DIR}
   ${Boost_INCLUDE_DIRS}
   ${OPENAL_INCLUDE_DIR}
@@ -17 +17 @@
 # Check whether the required CEGUILua version is even available
 IF(NOT IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ceguilua-${CEGUI_VERSION})
-  MESSAGE(FATAL_ERROR "Your CEGUI version is not supported (${CEGUI_VERSION})")
+  MESSAGE(FATAL_ERROR "No matching CEGUILua version shipped with Orxonox (${CEGUI_VERSION})")
 ENDIF(NOT IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ceguilua-${CEGUI_VERSION})
 
@@ -39 +39 @@
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DTIXML_USE_TICPP")
 
+# Include macros
+INCLUDE(AddSourceFiles)
+INCLUDE(UseTolua)
+
+# External libraries, but copied into the repository
 ADD_SUBDIRECTORY(ceguilua-${CEGUI_VERSION}/ceguilua)
 ADD_SUBDIRECTORY(cpptcl)
@@ -46 +51 @@
 ADD_SUBDIRECTORY(tolua)
 
-# Include macros
-INCLUDE(AddSourceFiles)
-INCLUDE(UseTolua)
-
 # Our own libraries
 ADD_SUBDIRECTORY(util)