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: Merge CMake fixes from the trunk

[SVN r52811]
---
 CMakeLists.txt | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'CMakeLists.txt')

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()
+
 ##########################################################################
 
 ##########################################################################
-- 
cgit v1.2.1