From 0551656d5b4f55597d3040b4ad6c9b8dda78dd20 Mon Sep 17 00:00:00 2001
From: Douglas Gregor <doug.gregor@gmail.com>
Date: Wed, 6 May 2009 21:12:42 +0000
Subject: [PATCH] Merge CMake fixes from the trunk

[SVN r52811]
---
 CMakeLists.txt  | 14 ++++++++++----
 libs/test       |  2 +-
 libs/wave       |  2 +-
 tools/quickbook |  2 +-
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 92d4b2388b..8d8ace8bed 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -234,11 +234,17 @@ if(WIN32 AND NOT UNIX)
 endif(WIN32 AND NOT UNIX)
 include(CPack)
 
-if(COMMAND cpack_configure_downloads)
-  cpack_configure_downloads(
-  "http://www.osl.iu.edu/~dgregor/Boost-CMake/${BOOST_VERSION}/"
-    ALL ADD_REMOVE)
+option(BOOST_INSTALLER_ON_THE_FLY
+       "Whether to build installers that download components on-the-fly" OFF)
+
+if (BOOST_INSTALLER_ON_THE_FLY)
+  if(COMMAND cpack_configure_downloads)
+    cpack_configure_downloads(
+    "http://www.osl.iu.edu/~dgregor/Boost-CMake/${BOOST_VERSION}/"
+      ALL ADD_REMOVE)
+  endif()
 endif()
+
 ##########################################################################
 
 ##########################################################################
diff --git a/libs/test b/libs/test
index ad148e9872..ec92df8245 160000
--- a/libs/test
+++ b/libs/test
@@ -1 +1 @@
-Subproject commit ad148e98727bf3644be8363b68cf3dbcc3cf6ddb
+Subproject commit ec92df8245cc92ea1867ec9ec43d5dd321c877df
diff --git a/libs/wave b/libs/wave
index 2556452eb7..06bbbedff4 160000
--- a/libs/wave
+++ b/libs/wave
@@ -1 +1 @@
-Subproject commit 2556452eb7f61f8959a1540cf087fcd68f2a021b
+Subproject commit 06bbbedff41fb71cfa703734214220c56198afd0
diff --git a/tools/quickbook b/tools/quickbook
index 4078431c29..a53f744bd2 160000
--- a/tools/quickbook
+++ b/tools/quickbook
@@ -1 +1 @@
-Subproject commit 4078431c29324cb960d06a08e7e992980f38b35e
+Subproject commit a53f744bd2dce6df8343590491efcf260733f20d