[Boost-commit] svn:boost r46746 - branches/CMake/release

From: troy_at_[hidden]
Date: 2008-06-26 16:05:24

Author: troy
Date: 2008-06-26 16:05:23 EDT (Thu, 26 Jun 2008)
New Revision: 46746
URL: http://svn.boost.org/trac/boost/changeset/46746

Log:
make CMAKE_LIBRARY_OUTPUT_DIRECTORY, etc. visible to boost modules
Text files modified: 
   branches/CMake/release/CMakeLists.txt |    24 +++++++-----------------                
   1 files changed, 7 insertions(+), 17 deletions(-)

Modified: branches/CMake/release/CMakeLists.txt
==============================================================================
--- branches/CMake/release/CMakeLists.txt	(original)
+++ branches/CMake/release/CMakeLists.txt	2008-06-26 16:05:23 EDT (Thu, 26 Jun 2008)
@@ -36,6 +36,13 @@
 set(BOOST_VERSION "${BOOST_VERSION_MAJOR}.${BOOST_VERSION_MINOR}.${BOOST_VERSION_SUBMINOR}")
 ##########################################################################
 
+# Put the libaries and binaries that get built into directories at the
+# top of the build tree rather than in hard-to-find leaf
+# directories. This simplifies manual testing and the use of the build
+# tree rather than installed Boost libraries.
+SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+
 ##########################################################################
 # Boost CMake modules                                                    #
 ##########################################################################
@@ -135,23 +142,6 @@
   include_directories(${Boost_SOURCE_DIR})
 endif (TEST_INSTALLED_TREE)
 
-# Put the libaries and binaries that get built into directories at the
-# top of the build tree rather than in hard-to-find leaf
-# directories. This simplifies manual testing and the use of the build
-# tree rather than installed Boost libraries.
-SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
-SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-
-# 
-# If we're on windows, we're going to need the lib output dir 
-# in our path so's we can find those dlls
-#
-if (WIN32)
-  set(ENV{PATH} "$ENV{PATH};${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
-endif (WIN32)
-
-
-
 # Boost.Build version 2 does this due to trouble with autolinking
 # during building and testing.  
 # TODO: See if we can actually use auto-linking in our regression tests.