From: dgregor_at_[hidden]
Date: 2007-06-09 01:29:54
Author: dgregor
Date: 2007-06-09 01:29:54 EDT (Sat, 09 Jun 2007)
New Revision: 4509
URL: http://svn.boost.org/trac/boost/changeset/4509
Log:
Fix a bug that turned off building all but the Python library
Text files modified:
sandbox-branches/boost-cmake/boost_1_34_0/tools/build/CMake/BoostCore.cmake | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
Modified: sandbox-branches/boost-cmake/boost_1_34_0/tools/build/CMake/BoostCore.cmake
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/tools/build/CMake/BoostCore.cmake (original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/tools/build/CMake/BoostCore.cmake 2007-06-09 01:29:54 EDT (Sat, 09 Jun 2007)
@@ -562,17 +562,21 @@
# library, collectively.
add_custom_target(${LIBNAME})
- # Build the set of variants that we will generate for this library
- set(THIS_LIB_VARIANTS)
- foreach(VARIANT ${BOOST_DEFAULT_VARIANTS})
- foreach(EXTRA_VARIANT ${THIS_LIB_EXTRA_VARIANTS})
- string(REPLACE ":" ";" FEATURES "${EXTRA_VARIANT}")
- separate_arguments(FEATURES)
- foreach(FEATURE ${FEATURES})
- list(APPEND THIS_LIB_VARIANTS "${VARIANT}:${FEATURE}")
- endforeach(FEATURE ${FEATURES})
- endforeach(EXTRA_VARIANT ${THIS_LIB_EXTRA_VARIANTS})
- endforeach(VARIANT ${BOOST_DEFAULT_VARIANTS})
+ if (THIS_LIB_EXTRA_VARIANTS)
+ # Build the set of variants that we will generate for this library
+ set(THIS_LIB_VARIANTS)
+ foreach(VARIANT ${BOOST_DEFAULT_VARIANTS})
+ foreach(EXTRA_VARIANT ${THIS_LIB_EXTRA_VARIANTS})
+ string(REPLACE ":" ";" FEATURES "${EXTRA_VARIANT}")
+ separate_arguments(FEATURES)
+ foreach(FEATURE ${FEATURES})
+ list(APPEND THIS_LIB_VARIANTS "${VARIANT}:${FEATURE}")
+ endforeach(FEATURE ${FEATURES})
+ endforeach(EXTRA_VARIANT ${THIS_LIB_EXTRA_VARIANTS})
+ endforeach(VARIANT ${BOOST_DEFAULT_VARIANTS})
+ else (THIS_LIB_EXTRA_VARIANTS)
+ set(THIS_LIB_VARIANTS ${BOOST_DEFAULT_VARIANTS})
+ endif (THIS_LIB_EXTRA_VARIANTS)
# Build each of the library variants
foreach(VARIANT_STR ${THIS_LIB_VARIANTS})