Changeset 9474 for code/branches/testing/src

Timestamp:

Nov 29, 2012, 10:30:42 PM (12 years ago)

Author:

landauf

Message:

moved settings for executables in visual studio to TargetUtilities to make them work for orxonox-main and test-executables
define test-executables with ORXONOX_ADD_EXECUTABLE

Location:

code/branches/testing/src

Files:

• CMakeLists.txt (modified) (2 diffs)
• template.vcproj.user.in (moved) (moved from code/branches/testing/src/orxonox-main.vcproj.user.in)
• template.vcxproj.user.in (moved) (moved from code/branches/testing/src/orxonox-main.vcxproj.user.in)

code/branches/testing/src/CMakeLists.txt

@@ -78 +78 @@
 
 
-# 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)
@@ -90 +83 @@
   ELSE()
     SET(MSVC_PLATFORM "Win32")
-  ENDIF()
-  IF(MSVC10)
-    CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/orxonox-main.vcxproj.user.in" "${CMAKE_CURRENT_BINARY_DIR}/orxonox-main.vcxproj.user")
-  ELSE()
-    STRING(REGEX REPLACE "^Visual Studio ([0-9][0-9]?).*$" "\\1"
-           VISUAL_STUDIO_VERSION_SIMPLE "${CMAKE_GENERATOR}")
-    CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/orxonox-main.vcproj.user.in" "${CMAKE_CURRENT_BINARY_DIR}/orxonox-main.vcproj.user")
   ENDIF()
 ENDIF(MSVC)