Changeset 9474 for code/branches/testing/test/util

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

File:

• code/branches/testing/test/util/CMakeLists.txt (modified) (2 diffs)

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)