From dd7463094c0485f770981e7e776f49cf4e10bee8 Mon Sep 17 00:00:00 2001
From: "Troy D. Straszheim" <troy@resophonic.com>
Date: Thu, 21 May 2009 00:31:35 +0000
Subject: [PATCH] tune up link tests in general, asio tests specifically

[SVN r53147]
---
 CMake/BoostCore.cmake         |  4 +++-
 CMake/BoostTesting.cmake      | 23 +++++++++++++----------
 CMake/LinkTest/CMakeLists.txt | 12 ++++++++++--
 3 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/CMake/BoostCore.cmake b/CMake/BoostCore.cmake
index 5046c5770..d1116f713 100644
--- a/CMake/BoostCore.cmake
+++ b/CMake/BoostCore.cmake
@@ -728,7 +728,9 @@ macro(boost_library_variant LIBNAME)
       
     # The basic LIBNAME target depends on each of the variants
     add_dependencies(${LIBNAME} ${VARIANT_LIBNAME})
-    
+
+    export(TARGETS ${VARIANT_LIBNAME} FILE ${CMAKE_BINARY_DIR}/exports/${VARIANT_LIBNAME}.cmake)
+
     # Link against whatever libraries this library depends on
     target_link_libraries(${VARIANT_LIBNAME} ${THIS_VARIANT_LINK_LIBS})
     foreach(dependency ${THIS_LIB_DEPENDS})
diff --git a/CMake/BoostTesting.cmake b/CMake/BoostTesting.cmake
index 9aa2ed8c1..429d00307 100644
--- a/CMake/BoostTesting.cmake
+++ b/CMake/BoostTesting.cmake
@@ -396,7 +396,15 @@ endmacro(boost_test_compile_fail)
 #
 # boost_test_link:
 #
-# Under construction.
+#
+# Each library "exports" itself to
+# ${CMAKE_BINARY_DIR}/exports/<variantname>.cmake
+#
+# The list of 'depends' for these libraries has to match one of those
+# files, this way the export mechanism works.  The generated
+# cmakelists will include() those exported .cmake files, for each
+# DEPENDS.
+#
 #
 macro(boost_test_link testname)
   boost_test_parse_args(${testname} ${ARGN} LINK)
@@ -410,15 +418,9 @@ macro(boost_test_link testname)
       set(BOOST_TEST_INCLUDES "${BOOST_TEST_INCLUDES};${DIR}")
     endforeach(DIR ${BOOST_TEST_INCLUDE_DIRS})
 
-    set(TARGET_LINK_LIBRARIES_LIST "")
-    foreach(DEP ${BOOST_TEST_DEPENDS})
-      get_target_property(THISONE_LOCATION ${DEP} LOCATION)
-      list(APPEND TARGET_LINK_LIBRARIES_LIST ${THISONE_LOCATION})
-    endforeach()
-
-
     add_test(${BOOST_TEST_TESTNAME}
       ${CMAKE_CTEST_COMMAND}
+      -VV
       --build-and-test
       ${Boost_SOURCE_DIR}/tools/build/CMake/LinkTest
       ${Boost_BINARY_DIR}/tools/build/CMake/LinkTest
@@ -426,11 +428,12 @@ macro(boost_test_link testname)
       --build-makeprogram ${CMAKE_MAKE_PROGRAM}
       --build-project LinkTest
       --build-options 
-      "-DPARENT_BINARY_DIR:FILEPATH=${CMAKE_CACHEFILE_DIR}"
+      "-DBOOST_EXPORTS_DIR:FILEPATH=${CMAKE_BINARY_DIR}/exports"
       "-DSOURCE:STRING=${CMAKE_CURRENT_SOURCE_DIR}/${BOOST_TEST_SOURCES}"
       "-DINCLUDES:STRING=${BOOST_TEST_INCLUDES}"
       "-DCOMPILE_FLAGS:STRING=${BOOST_TEST_COMPILE_FLAGS}"
-      "-DLINK_LIBS:STRING=${BOOST_TEST_LINK_LIBS};${TARGET_LINK_LIBRARIES_LIST}"
+      "-DLINK_LIBS:STRING=${BOOST_TEST_LINK_LIBS}"
+      "-DDEPENDS:STRING=${BOOST_TEST_DEPENDS}"
       )
 
     set_tests_properties(${BOOST_TEST_TESTNAME}
diff --git a/CMake/LinkTest/CMakeLists.txt b/CMake/LinkTest/CMakeLists.txt
index 37977d5ac..f2c434387 100644
--- a/CMake/LinkTest/CMakeLists.txt
+++ b/CMake/LinkTest/CMakeLists.txt
@@ -1,6 +1,11 @@
 cmake_minimum_required(VERSION 2.6)
 
-load_cache(${PARENT_BINARY_DIR})
+file(GLOB BOOST_EXPORTS "${BOOST_EXPORTS_DIR}/*.cmake")
+
+foreach(import
+    ${DEPENDS})
+  include(${BOOST_EXPORTS_DIR}/${import}.cmake)
+endforeach()
 
 project(LinkTest)
 include_directories (${INCLUDES})
@@ -8,5 +13,8 @@ add_executable(link-test ${SOURCE})
 set_source_files_properties(${SOURCE}
   PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS}")
 
+message("DEPENDS=====${DEPENDS}")
+
 target_link_libraries(link-test
-  ${LINK_LIBS})
+  ${LINK_LIBS}
+  ${DEPENDS})