diff options
| author | Douglas Gregor <doug.gregor@gmail.com> | 2009-05-06 21:12:42 +0000 |
|---|---|---|
| committer | Douglas Gregor <doug.gregor@gmail.com> | 2009-05-06 21:12:42 +0000 |
| commit | 0551656d5b4f55597d3040b4ad6c9b8dda78dd20 (patch) | |
| tree | b4ee6254349c86d4dc6f74a6efcff32ba7d0ba79 | |
| parent | 866a53ac5ebca57e8ea8514f316c670d14c88f3e (diff) | |
| download | boost-0551656d5b4f55597d3040b4ad6c9b8dda78dd20.tar.gz | |
Merge CMake fixes from the trunk
[SVN r52811]
| -rw-r--r-- | CMakeLists.txt | 14 | ||||
| m--------- | libs/test | 0 | ||||
| m--------- | libs/wave | 0 | ||||
| m--------- | tools/quickbook | 0 |
4 files changed, 10 insertions, 4 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 -Subproject ad148e98727bf3644be8363b68cf3dbcc3cf6dd +Subproject ec92df8245cc92ea1867ec9ec43d5dd321c877d diff --git a/libs/wave b/libs/wave -Subproject 2556452eb7f61f8959a1540cf087fcd68f2a021 +Subproject 06bbbedff41fb71cfa703734214220c56198afd diff --git a/tools/quickbook b/tools/quickbook -Subproject 4078431c29324cb960d06a08e7e992980f38b35 +Subproject a53f744bd2dce6df8343590491efcf260733f20 |