Changeset 2590 for code/branches/buildsystem2/cmake

Timestamp:

Jan 12, 2009, 5:06:56 PM (16 years ago)

Author:

rgrieder

Message:

Added ${ORXONOX_LIBRARY_BIN_DIR} which represents the binary directory for the external dlls on windows.
Restructured concepts in bin/ dir:

• All files in bin/Release or bin/Debug get configured and copied to the output directory. Configure means setting all the variables marked with @Var@.
• MinSizeRel and RelWithDebInfo are considered Release versions.
• If there is not specialised file in bin/Debug resp. bin/Release, the file in bin/ is configured and copied.
• orxonox.ini gets configured with the available plugins (release and debug), the plugins folder and the media directory.
• Also the debug levels have been adjusted for Debug resp. Release versions of orxonox.ini
• When not using multi-config (debug, release, etc.) generator (like msvc or xcode), a run script called run (unix) or run.bat (windows) is configured in the root directory.
• For tardis, ogre.cfg is copied as well due to a yet unknown bug with fonts for the ogre gui
• moved all old style msvc project files to visual_studio folder (that only includes configured output files)
• This commit also makes the visual studio files run in all configurations (tested only on my box).

Location:

code/branches/buildsystem2/cmake

Files:

• ConfigMSVC.cmake (modified) (3 diffs)
• ConfigMinGW.cmake (modified) (1 diff)
• ConfigPlatforms.cmake (modified) (1 diff)

code/branches/buildsystem2/cmake/ConfigMSVC.cmake

@@ -44 +44 @@
     MESSAGE(FATAL_ERROR "Could not find dependency directory for the Visual Studio libraries")
   ENDIF(EXISTS ${CMAKE_SOURCE_DIR}/dependencies/orxonox_vc8)
+  SET(ORXONOX_LIBRARY_BIN_DIR ${MSVC_LIBRARY_DIR}/bin)
 
   # Set variables for the include directories and the libraries
@@ -56 +57 @@
   SET(ENV{OPENALDIR}         ${MSVC_LIBRARY_DIR}/openal-1.1)
   SET(ENV{LUA_DIR}           ${MSVC_LIBRARY_DIR}/lua-5.1.3)
-  SET(ENV{OGRE_HOME}        "${MSVC_LIBRARY_DIR}/ogre-1.4.9;${MSVC_LIBRARY_DIR}/bin")
+  SET(ENV{OGRE_HOME}        "${MSVC_LIBRARY_DIR}/ogre-1.4.9;${ORXONOX_LIBRARY_BIN_DIR}")
   SET(TCL_INCLUDE_PATH       ${MSVC_LIBRARY_DIR}/tcl-8.5.2/include)
   SET(TCL_LIBRARY            ${MSVC_LIBRARY_DIR}/tcl-8.5.2/lib/tcl85t.lib)
@@ -126 +127 @@
 
   # Set tolua working directory because lua.dll is not where tolua is
-  SET(TOLUA_PARSER_WORKING_DIRECTORY ${MSVC_LIBRARY_DIR}/bin)
+  SET(TOLUA_PARSER_WORKING_DIRECTORY ${ORXONOX_LIBRARY_BIN_DIR})
 ENDIF (MSVC)

code/branches/buildsystem2/cmake/ConfigMinGW.cmake

@@ -42 +42 @@
     MESSAGE(FATAL_ERROR "Could not find dependency directory for the MinGW libraries")
   ENDIF(EXISTS ${CMAKE_SOURCE_DIR}/libs)
-
+  SET(ORXONOX_LIBRARY_BIN_DIR ${MINGW_LIBRARY_DIR})
 
   # Note: When setting ENV${} variables, make sure to use quotes when

code/branches/buildsystem2/cmake/ConfigPlatforms.cmake

@@ -34 +34 @@
 # When searching for debug libraries, this is appended to the libarary name
 SET(LIBRARY_DEBUG_POSTFIX "_d")
+# Sets where to find the binary directory of external libraries
+SET(ORXONOX_LIBRARY_BIN_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
 # Working directory for the tolua parser. Adjust for windows because lua.dll has to be there!
 SET(TOLUA_PARSER_WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})