Changeset 2590 for code/branches/buildsystem2/src

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/src/orxonox

Files:

• CMakeLists.txt (modified) (2 diffs)
• orxonox.vcproj.user (added)

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

@@ -25 +25 @@
 
 ADD_EXECUTABLE(orxonox ${ORXONOX_SRC_FILES})
+GET_TARGET_PROPERTY(_exec_loc orxonox LOCATION)
+GET_FILENAME_COMPONENT(_exec_name ${_exec_loc} NAME)
+SET(ORXONOX_EXECUTABLE_NAME ${_exec_name} CACHE STRING "")
+MARK_AS_ADVANCED(ORXONOX_EXECUTABLE_NAME)
 
 IF(NETWORKTRAFFIC_TESTING_ENABLED)
@@ -52 +56 @@
 )
 
+# When using Visual Studio we want to use the output directory as working
+# directory and we also want to specify where the external dlls
+# (lua, ogre, etc.) are. The problem hereby is that these information cannot
+# be specified in CMake because they are not stored in the actual project file.
+# This workaround will create a configured *.vcproj.user file that holds the
+# right values. When starting the solution for the first time,
+# these get written to the *vcproj.yourPCname.yourname.user
+IF(MSVC)
+  IF(CMAKE_CL_64)
+    SET(MSVC_PLATFORM "x64")
+  ELSE(CMAKE_CL_64)
+    SET(MSVC_PLATFORM "Win32")
+  ENDIF(CMAKE_CL_64)
+  CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/orxonox.vcproj.user" "${CMAKE_CURRENT_BINARY_DIR}/orxonox.vcproj.user")
+ENDIF(MSVC)
+
 IF (NOT WIN32)
   INSTALL(TARGETS orxonox RUNTIME DESTINATION bin)