[Boost-commit] svn:boost r7078

From: troy_at_[hidden]
Date: 2007-06-16 13:21:49

Author: troy
Date: 2007-06-16 13:21:48 EDT (Sat, 16 Jun 2007)
New Revision: 7078
URL: http://svn.boost.org/trac/boost/changeset/7078

Log:

Only append -debug to variants when both BUILD_DEBUG and BUILD_RELEASE
are ON.  Fixes bug that tests wouldn't link when only BUILD_DEBUG was
ON.

Text files modified: 
   sandbox-branches/boost-cmake/boost_1_34_0/tools/build/CMake/BoostCore.cmake |     6 +++---                                  
   1 files changed, 3 insertions(+), 3 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-16 13:21:48 EDT (Sat, 16 Jun 2007)
@@ -174,12 +174,12 @@
   # TODO: STLport rather than default library
   # TODO: STLport's deprecated iostreams
 
-  # Add -debug for debug libraries
+  # Add -debug for debug libraries only if BUILD_RELEASE is ON
   list_contains(VARIANT_IS_DEBUG DEBUG ${ARGN})
-  if (VARIANT_IS_DEBUG)
+  if (VARIANT_IS_DEBUG AND BUILD_RELEASE)
     set(VARIANT_TARGET_NAME "${VARIANT_TARGET_NAME}-debug")
     set(VARIANT_ABI_TAG "${VARIANT_ABI_TAG}d")
-  endif (VARIANT_IS_DEBUG)
+  endif (VARIANT_IS_DEBUG AND BUILD_RELEASE)
 
   # If there is an ABI tag, append it to the versioned name
   if (VARIANT_ABI_TAG)