[Orxonox-commit 4806] r9475 - in code/branches/testing: src/external/gmock src/external/gtest test/util

[landauf at orxonox.net]

Author: landauf
Date: 2012-11-29 22:55:05 +0100 (Thu, 29 Nov 2012)
New Revision: 9475

Modified:
   code/branches/testing/src/external/gmock/CMakeLists.txt
   code/branches/testing/src/external/gtest/CMakeLists.txt
   code/branches/testing/test/util/CMakeLists.txt
Log:
exclude gtest and gmock from default build target

Modified: code/branches/testing/src/external/gmock/CMakeLists.txt
===================================================================
--- code/branches/testing/src/external/gmock/CMakeLists.txt	2012-11-29 21:30:42 UTC (rev 9474)
+++ code/branches/testing/src/external/gmock/CMakeLists.txt	2012-11-29 21:55:05 UTC (rev 9475)
@@ -31,6 +31,8 @@
 ORXONOX_ADD_LIBRARY(gmock_orxonox
     ORXONOX_EXTERNAL
     VERSION         1.6.0
+    EXCLUDE_FROM_ALL
+    NO_INSTALL
     LINK_LIBRARIES  gtest_orxonox
     SOURCE_FILES    ${GMOCK_FILES}
 )

Modified: code/branches/testing/src/external/gtest/CMakeLists.txt
===================================================================
--- code/branches/testing/src/external/gtest/CMakeLists.txt	2012-11-29 21:30:42 UTC (rev 9474)
+++ code/branches/testing/src/external/gtest/CMakeLists.txt	2012-11-29 21:55:05 UTC (rev 9475)
@@ -30,6 +30,8 @@
 ORXONOX_ADD_LIBRARY(gtest_orxonox
     ORXONOX_EXTERNAL
     VERSION         1.6.0
+    EXCLUDE_FROM_ALL
+    NO_INSTALL
     SOURCE_FILES    ${GTEST_FILES}
 )
 

Modified: code/branches/testing/test/util/CMakeLists.txt
===================================================================
--- code/branches/testing/test/util/CMakeLists.txt	2012-11-29 21:30:42 UTC (rev 9474)
+++ code/branches/testing/test/util/CMakeLists.txt	2012-11-29 21:55:05 UTC (rev 9475)
@@ -1,10 +1,10 @@
 ORXONOX_ADD_EXECUTABLE(
     util_test
     EXCLUDE_FROM_ALL
-	NO_INSTALL
+    NO_INSTALL
   LINK_LIBRARIES
     util
-	gmock_orxonox
+    gmock_orxonox
   SOURCE_FILES
     ${GMOCK_MAIN}
     ConvertTest.cc