[Cmake-commits] CMake branch, next, updated. v2.8.3-1080-g251c851

[Bill Hoffman]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  251c8514e29c80ac737060487b61f43394dee77c (commit)
       via  8c7b19d35ee81afac57fe623217578191f4d034c (commit)
      from  503544980c38bacdde19255b0597db8151d0c7c4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=251c8514e29c80ac737060487b61f43394dee77c
commit 251c8514e29c80ac737060487b61f43394dee77c
Merge: 5035449 8c7b19d
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Wed Dec 22 16:15:14 2010 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Dec 22 16:15:14 2010 -0500

    Merge topic 'add_preprocessor_def_vs2010_resources' into next
    
    8c7b19d Only run resource test for MSVC compilers.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8c7b19d35ee81afac57fe623217578191f4d034c
commit 8c7b19d35ee81afac57fe623217578191f4d034c
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Wed Dec 22 16:14:37 2010 -0500
Commit:     Bill Hoffman <bill.hoffman at kitware.com>
CommitDate: Wed Dec 22 16:14:37 2010 -0500

    Only run resource test for MSVC compilers.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index f7d3c18..8f29641 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -131,6 +131,9 @@ IF(BUILD_TESTING)
   ADD_TEST_MACRO(TarTest TarTest)
   ADD_TEST_MACRO(SystemInformation SystemInformation)
   ADD_TEST_MACRO(MathTest MathTest)
+  IF(MSVC)
+    ADD_TEST_MACRO(VSResource VSResource)
+  ENDIF()
   ADD_TEST_MACRO(Simple Simple)
   ADD_TEST_MACRO(PreOrder PreOrder)
   ADD_TEST_MACRO(MissingSourceFile MissingSourceFile)
@@ -261,17 +264,6 @@ IF(BUILD_TESTING)
     ENDIF ("${cmakeOutput}" MATCHES KDevelop3)
 
   ENDIF(${CMAKE_TEST_GENERATOR} MATCHES "Unix Makefiles"  OR  ${CMAKE_TEST_GENERATOR} MATCHES "KDevelop")
- ADD_TEST(VSResource ${CMAKE_CTEST_COMMAND}
-      --build-and-test
-      "${CMake_SOURCE_DIR}/Tests/VSResource"
-      "${CMake_BINARY_DIR}/Tests/VSResource"
-      --build-two-config
-      --build-generator ${CMAKE_TEST_GENERATOR}
-      --build-project VSResource
-      --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
-      --test-command VSResource)
-    LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/VSResource")
-
 
   # test for correct sub-project generation
   # not implemented in VS6 or Xcode

-----------------------------------------------------------------------

Summary of changes:
 Tests/CMakeLists.txt |   14 +++-----------
 1 files changed, 3 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
CMake