Changeset 2583 for code/branches/buildsystem2/src

Timestamp:

Jan 12, 2009, 1:33:55 PM (16 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

Location:

code/branches/buildsystem2/src

Files:

• CMakeLists.txt (modified) (4 diffs)
• audio/CMakeLists.txt (modified) (1 diff)
• network/CMakeLists.txt (modified) (1 diff)
• ogreceguirenderer/CMakeLists.txt (modified) (1 diff)
• orxonox/OrxonoxPrereqs.h (modified) (1 diff)
• tolua/CMakeLists.txt (modified) (3 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)

code/branches/buildsystem2/src/audio/CMakeLists.txt

@@ -19 +19 @@
   ${OGG_LIBRARY}
   core
+  util
 )
 

code/branches/buildsystem2/src/network/CMakeLists.txt

@@ -28 +28 @@
   ${ENET_LIBRARY}
   ${Boost_THREAD_LIBRARY}
+  util
   core
 )

code/branches/buildsystem2/src/ogreceguirenderer/CMakeLists.txt

@@ -7 +7 @@
 ADD_LIBRARY(ogreceguirenderer_orxonox SHARED ${SRC_FILES})
 
+TARGET_LINK_LIBRARIES(ogreceguirenderer_orxonox
+  ${OGRE_LIBRARY}
+  ${CEGUI_LIBRARY}
+)
 IF (NOT WIN32)
   INSTALL(TARGETS ogreceguirenderer_orxonox LIBRARY DESTINATION lib)

code/branches/buildsystem2/src/orxonox/OrxonoxPrereqs.h

@@ -40 +40 @@
 // Shared library settings
 //-----------------------------------------------------------------------
+#define ORXONOX_NO_EXPORTS // This is an executable that needs no exports
 #if (ORXONOX_PLATFORM == ORXONOX_PLATFORM_WIN32) && !(defined(ORXONOX_STATIC_BUILD) || defined(ORXONOX_NO_EXPORTS))
 #  ifdef ORXONOX_SHARED_BUILD

code/branches/buildsystem2/src/tolua/CMakeLists.txt

@@ -6 +6 @@
   tolua_to.c
 )
+TARGET_LINK_LIBRARIES(tolualib_orxonox ${LUA_LIBRARY})
 
 IF (NOT WIN32)
@@ -27 +28 @@
 ENDIF("${LUA_VERSION}" MATCHES "^5.0")
 
-# Set some variables to the parent scope in order to use them in the TOLUA macro
-GET_TARGET_PROPERTY(_temp_location toluaexe_orxonox LOCATION)
-SET(TOLUA_PARSER_EXECUTABLE ${_temp_location} PARENT_SCOPE)
-SET(TOLUA_PARSER_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/${TOLUA_ALL_PACK}" PARENT_SCOPE)
+# Set some variables to the cache in order to use them in the TOLUA macro
+SET(TOLUA_PARSER_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/${TOLUA_ALL_PACK}" CACHE STRING "")
 SET(TOLUA_PARSER_DEPENDENCIES
   toluaexe_orxonox
@@ -56 +55 @@
   ${CMAKE_CURRENT_SOURCE_DIR}/lua/doit.lua
 
-  PARENT_SCOPE
+  CACHE STRING ""
 )
+MARK_AS_ADVANCED(TOLUA_PARSER_SOURCE TOLUA_PARSER_DEPENDENCIES)