Merge CMake fixes from the trunk

[SVN r52811]
This commit is contained in:
Douglas Gregor 2009-05-06 21:12:42 +00:00
parent 866a53ac5e
commit 0551656d5b
4 changed files with 13 additions and 7 deletions

View file

@ -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()
##########################################################################
##########################################################################

@ -1 +1 @@
Subproject commit ad148e98727bf3644be8363b68cf3dbcc3cf6ddb
Subproject commit ec92df8245cc92ea1867ec9ec43d5dd321c877df

@ -1 +1 @@
Subproject commit 2556452eb7f61f8959a1540cf087fcd68f2a021b
Subproject commit 06bbbedff41fb71cfa703734214220c56198afd0

@ -1 +1 @@
Subproject commit 4078431c29324cb960d06a08e7e992980f38b35e
Subproject commit a53f744bd2dce6df8343590491efcf260733f20d