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

Timestamp:

Jan 12, 2009, 1:33:55 PM (15 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/CMakeLists.txt (modified) (5 diffs)

code/branches/buildsystem2/CMakeLists.txt

@@ -14 +14 @@
 
 # Set binary output directories
-SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
-SET(LIBRARY_OUTPUT_PATH    ${PROJECT_BINARY_DIR}/bin)
-MARK_AS_ADVANCED(EXECUTABLE_OUTPUT_PATH LIBRARY_OUTPUT_PATH)
+SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 
 # Set Debug build to default when not having multi-config generator like msvc
@@ -25 +25 @@
 ############## Platform Config ##################
 
-# Configre platform specific options
+# Configure platform specific options
 INCLUDE(ConfigPlatforms)
 
@@ -40 +40 @@
 ############### Library finding #################
 
-INCLUDE(FindPackageHandleStandardArgs)
-INCLUDE(HandleLibraryTypes)
+# Performs the search and sets the variables
 
-# Performs the search and sets the variables
+# Expand the next statement if newer boost versions than 1.36.1 are released
+SET(Boost_ADDITIONAL_VERSIONS 1.37 1.37.0 CACHE STRING "")
+FIND_PACKAGE(Boost 1.34 REQUIRED thread filesystem)
 FIND_PACKAGE(OGRE REQUIRED)
 FIND_PACKAGE(CEGUI REQUIRED)
 FIND_PACKAGE(ENet REQUIRED)
-FIND_PACKAGE(Boost 1.34 REQUIRED thread filesystem)
 FIND_PACKAGE(OpenAL REQUIRED)
 FIND_PACKAGE(ALUT REQUIRED)
@@ -57 +57 @@
 FIND_PACKAGE(Lua50 QUIET)
 IF(NOT LUA50_FOUND)
-    # Remove variables set by Lua50 and try with Lua51
-    SET(LUA_INCLUDE_DIR)
-    SET(LUA_LIBRARY_lua)
-    SET(LUA_LIBRARY_lualib)
-    SET(LUA_LIBRARIES)
-    FIND_PACKAGE(Lua51 REQUIRED)
+  # Remove variables set by Lua50 and try with Lua51
+  SET(LUA_INCLUDE_DIR)
+  SET(LUA_LIBRARY_lua)
+  SET(LUA_LIBRARY_lualib)
+  SET(LUA_LIBRARIES)
+  FIND_PACKAGE(Lua51 REQUIRED)
 ENDIF(NOT LUA50_FOUND)
 # Determine Lua version (Lua50 may also find Lua51)
@@ -71 +71 @@
 FIND_PACKAGE(TCL QUIET)
 IF(NOT TCL_FOUND)
-    MESSAGE(FATAL_ERROR "Tcl was not found.")
+  MESSAGE(FATAL_ERROR "Tcl was not found.")
 ENDIF(NOT TCL_FOUND)
 
 # Hide variables created by CMake FindXX scripts
 MARK_AS_ADVANCED(
-    LUA_LIBRARY_lua
-    LUA_LIBRARY_lualib
-    OPENAL_INCLUDE_DIR
-    OPENAL_LIBRARY
+  LUA_LIBRARY_lua
+  LUA_LIBRARY_lualib
+  OPENAL_INCLUDE_DIR
+  OPENAL_LIBRARY
 )