[Boost-commit] svn:boost r4422

From: dgregor_at_[hidden]
Date: 2007-06-03 08:10:07

Author: dgregor
Date: 2007-06-03 08:10:06 EDT (Sun, 03 Jun 2007)
New Revision: 4422
URL: http://svn.boost.org/trac/boost/changeset/4422

Log:
tools/build/CMake/boost-testing.cmake:
  - Fix dependency checking so that we actually build & run test cases again :)

Text files modified: 
   sandbox-branches/boost-cmake/boost_1_34_0/tools/build/CMake/boost-testing.cmake |    16 ++++++++++------                        
   1 files changed, 10 insertions(+), 6 deletions(-)

Modified: sandbox-branches/boost-cmake/boost_1_34_0/tools/build/CMake/boost-testing.cmake
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/tools/build/CMake/boost-testing.cmake	(original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/tools/build/CMake/boost-testing.cmake	2007-06-03 08:10:06 EDT (Sun, 03 Jun 2007)
@@ -47,16 +47,20 @@
     
   # Categorize each of the arguments
   foreach(ARG ${BOOST_TEST_DEPENDS})
-    # If building static libraries is turned off..
     get_target_property(DEPEND_TYPE ${ARG} TYPE)
     get_target_property(DEPEND_LOCATION ${ARG} LOCATION)
-    if (NOT BUILD_STATIC_LIBS AND ${DEPEND_TYPE} STREQUAL "STATIC_LIBRARY")
+    # If building static libraries is turned off, don't try to build
+    # the test
+    if (NOT BUILD_STATIC AND ${DEPEND_TYPE} STREQUAL "STATIC_LIBRARY")
       set(BOOST_TEST_OKAY FALSE)
-    endif (NOT BUILD_STATIC_LIBS AND ${DEPEND_TYPE} STREQUAL "STATIC_LIBRARY")
-    if (NOT BUILD_SHARED_LIBS AND ${DEPEND_TYPE} STREQUAL "SHARED_LIBRARY")
+    endif (NOT BUILD_STATIC AND ${DEPEND_TYPE} STREQUAL "STATIC_LIBRARY")
+
+    # If building shared libraries is turned off, don't try to build
+    # the test
+    if (NOT BUILD_SHARED AND ${DEPEND_TYPE} STREQUAL "SHARED_LIBRARY")
       set(BOOST_TEST_OKAY FALSE)
-    endif (NOT BUILD_SHARED_LIBS AND ${DEPEND_TYPE} STREQUAL "SHARED_LIBRARY")
-    endforeach(ARG ${BOOST_TEST_DEPENDS})
+    endif (NOT BUILD_SHARED AND ${DEPEND_TYPE} STREQUAL "SHARED_LIBRARY")
+  endforeach(ARG ${BOOST_TEST_DEPENDS})
 
   # If no test specified, use the name of the test
   if (NOT BOOST_TEST_SOURCES)