Changeset 9474

Timestamp:

Nov 29, 2012, 10:30:42 PM (11 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

Files:

• cmake/tools/TargetUtilities.cmake (modified) (1 diff)
• src/CMakeLists.txt (modified) (2 diffs)
• src/template.vcproj.user.in (moved) (moved from code/branches/testing/src/orxonox-main.vcproj.user.in)
• src/template.vcxproj.user.in (moved) (moved from code/branches/testing/src/orxonox-main.vcxproj.user.in)
• test/util/CMakeLists.txt (modified) (2 diffs)

code/branches/testing/cmake/tools/TargetUtilities.cmake

@@ -82 +82 @@
 MACRO(ORXONOX_ADD_EXECUTABLE _target_name)
   TU_ADD_TARGET(${_target_name} EXECUTABLE "WIN32" ${ARGN})
+  
+  # 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()
+      SET(MSVC_PLATFORM "Win32")
+    ENDIF()
+    IF(MSVC10)
+      CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/src/template.vcxproj.user.in" "${CMAKE_CURRENT_BINARY_DIR}/${_target_name}.vcxproj.user")
+    ELSE()
+      STRING(REGEX REPLACE "^Visual Studio ([0-9][0-9]?).*$" "\\1"
+             VISUAL_STUDIO_VERSION_SIMPLE "${CMAKE_GENERATOR}")
+      CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/src/template.vcproj.user.in" "${CMAKE_CURRENT_BINARY_DIR}/${_target_name}.vcproj.user")
+    ENDIF()
+  ENDIF(MSVC)
 ENDMACRO(ORXONOX_ADD_EXECUTABLE)
 

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)

code/branches/testing/test/util/CMakeLists.txt

@@ -1 @@
-ADD_EXECUTABLE(
+ORXONOX_ADD_EXECUTABLE(
     util_test
     EXCLUDE_FROM_ALL
+        NO_INSTALL
+  LINK_LIBRARIES
+    util
+        gmock_orxonox
+  SOURCE_FILES
     ${GMOCK_MAIN}
     ConvertTest.cc
@@ -15 +20 @@
     VA_NARGSTest.cc
 )
-TARGET_LINK_LIBRARIES(util_test util gmock_orxonox)
 ADD_DEPENDENCIES(test util_test)
 
 ADD_TEST(util_test ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/util_test)
-
-#-----------------
-
-IF(MSVC)
-  IF(CMAKE_CL_64)
-    SET(MSVC_PLATFORM "x64")
-  ELSE()
-    SET(MSVC_PLATFORM "Win32")
-  ENDIF()
-  IF(MSVC10)
-    CONFIGURE_FILE("../../src/orxonox-main.vcxproj.user.in" "${CMAKE_CURRENT_BINARY_DIR}/util_test.vcxproj.user")
-  ELSE()
-    STRING(REGEX REPLACE "^Visual Studio ([0-9][0-9]?).*$" "\\1"
-           VISUAL_STUDIO_VERSION_SIMPLE "${CMAKE_GENERATOR}")
-    CONFIGURE_FILE("../../src/orxonox-main.vcproj.user.in" "${CMAKE_CURRENT_BINARY_DIR}/util_test.vcproj.user")
-  ENDIF()
-ENDIF(MSVC)