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

From: troy_at_[hidden]
Date: 2008-06-26 15:15:25

Author: troy
Date: 2008-06-26 15:15:24 EDT (Thu, 26 Jun 2008)
New Revision: 46738
URL: http://svn.boost.org/trac/boost/changeset/46738

Log:
use more modern cmake variables, append cmake path
Text files modified: 
   branches/CMake/release/CMakeLists.txt |    14 ++++++++++++--                          
   1 files changed, 12 insertions(+), 2 deletions(-)

Modified: branches/CMake/release/CMakeLists.txt
==============================================================================
--- branches/CMake/release/CMakeLists.txt	(original)
+++ branches/CMake/release/CMakeLists.txt	2008-06-26 15:15:24 EDT (Thu, 26 Jun 2008)
@@ -139,8 +139,18 @@
 # 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(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib)
-SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
+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.