[Boost-commit] svn:boost r52841 - branches/release/tools/build/CMake

Subject: [Boost-commit] svn:boost r52841 - branches/release/tools/build/CMake
From: dgregor_at_[hidden]
Date: 2009-05-07 16:59:28

Author: dgregor
Date: 2009-05-07 16:59:27 EDT (Thu, 07 May 2009)
New Revision: 52841
URL: http://svn.boost.org/trac/boost/changeset/52841

Log:
Add labels to CMake targets, for use with newer versions of CDash
Text files modified: 
   branches/release/tools/build/CMake/BoostCore.cmake    |     5 ++++-                                   
   branches/release/tools/build/CMake/BoostTesting.cmake |    15 +++++++++++++++                         
   2 files changed, 19 insertions(+), 1 deletions(-)

Modified: branches/release/tools/build/CMake/BoostCore.cmake
==============================================================================
--- branches/release/tools/build/CMake/BoostCore.cmake	(original)
+++ branches/release/tools/build/CMake/BoostCore.cmake	2009-05-07 16:59:27 EDT (Thu, 07 May 2009)
@@ -311,7 +311,6 @@
       endforeach(SUBDIR ${THIS_PROJECT_SRCDIRS})
     endif()
 
-    # FIXME: Temporary testing hack
     if(BUILD_TESTING AND THIS_PROJECT_TESTDIRS)
       # Testing is enabled globally and this project has some
       # tests. So, include the tests
@@ -672,6 +671,7 @@
         CLEAN_DIRECT_OUTPUT 1
         COMPILE_FLAGS "${THIS_VARIANT_COMPILE_FLAGS}"
         LINK_FLAGS "${THIS_VARIANT_LINK_FLAGS}"
+        LABELS "${PROJECT_NAME}"
         )
     elseif (THIS_LIB_MODULE)
       # Add a module
@@ -684,6 +684,7 @@
         CLEAN_DIRECT_OUTPUT 1
         COMPILE_FLAGS "${THIS_VARIANT_COMPILE_FLAGS}"
         LINK_FLAGS "${THIS_VARIANT_LINK_FLAGS}"
+        LABELS "${PROJECT_NAME}"
        # SOVERSION "${BOOST_VERSION}"
         )
     else (THIS_LIB_IS_STATIC)
@@ -697,6 +698,7 @@
         CLEAN_DIRECT_OUTPUT 1
         COMPILE_FLAGS "${THIS_VARIANT_COMPILE_FLAGS}"
         LINK_FLAGS "${THIS_VARIANT_LINK_FLAGS}"
+        LABELS "${PROJECT_NAME}"
         # SOVERSION "${BOOST_VERSION}"
         )
     endif (THIS_LIB_IS_STATIC)
@@ -1340,6 +1342,7 @@
       PROPERTIES
       COMPILE_FLAGS "${THIS_EXE_COMPILE_FLAGS}"
       LINK_FLAGS "${THIS_EXE_LINK_FLAGS}"
+      LABELS "${PROJECT_NAME}"
       )
 
     # For IDE generators where we can build both debug and release

Modified: branches/release/tools/build/CMake/BoostTesting.cmake
==============================================================================
--- branches/release/tools/build/CMake/BoostTesting.cmake	(original)
+++ branches/release/tools/build/CMake/BoostTesting.cmake	2009-05-07 16:59:27 EDT (Thu, 07 May 2009)
@@ -274,6 +274,11 @@
         ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/tests/${PROJECT_NAME}/${testname}
         ${BOOST_TEST_ARGS})
 
+      set_tests_properties(${BOOST_TEST_TESTNAME}
+        PROPERTIES
+        LABELS "${PROJECT_NAME}"
+        )
+
       if (BOOST_TEST_FAIL)
         set_tests_properties(${BOOST_TEST_TESTNAME} PROPERTIES WILL_FAIL ON)
       endif ()
@@ -339,6 +344,11 @@
       "-DCOMPILE_FLAGS:STRING=${BOOST_TEST_COMPILE_FLAGS}"
       )
 
+    set_tests_properties(${BOOST_TEST_TESTNAME}
+      PROPERTIES
+      LABELS "${PROJECT_NAME}"
+      )
+
     if (BOOST_TEST_FAIL)
       set_tests_properties(${BOOST_TEST_TESTNAME} PROPERTIES WILL_FAIL ON)      
     endif ()
@@ -377,6 +387,11 @@
       "-DCOMPILE_FLAGS:STRING=${BOOST_TEST_COMPILE_FLAGS}"
       )
 
+    set_tests_properties(${BOOST_TEST_TESTNAME}
+      PROPERTIES
+      LABELS "${PROJECT_NAME}"
+      )
+
     if (BOOST_TEST_FAIL)
       set_tests_properties(${BOOST_TEST_TESTNAME} PROPERTIES WILL_FAIL ON)      
     endif ()