[Boost-commit] svn:boost r46400 - branches/CMake/release/tools/build/CMake

From: troy_at_[hidden]
Date: 2008-06-14 21:24:48

Author: troy
Date: 2008-06-14 21:24:47 EDT (Sat, 14 Jun 2008)
New Revision: 46400
URL: http://svn.boost.org/trac/boost/changeset/46400

Log:
Windows support:  native paths
Text files modified: 
   branches/CMake/release/tools/build/CMake/BoostBuildSlave.cmake |    16 +++++++++++-----                        
   1 files changed, 11 insertions(+), 5 deletions(-)

Modified: branches/CMake/release/tools/build/CMake/BoostBuildSlave.cmake
==============================================================================
--- branches/CMake/release/tools/build/CMake/BoostBuildSlave.cmake	(original)
+++ branches/CMake/release/tools/build/CMake/BoostBuildSlave.cmake	2008-06-14 21:24:47 EDT (Sat, 14 Jun 2008)
@@ -58,17 +58,23 @@
   #
   #  Redirect various build steps
   # 
+  
+  file( TO_NATIVE_PATH "${PYTHON_EXECUTABLE}" NATIVE_PYTHON_EXECUTABLE )
+  file( TO_NATIVE_PATH "${BOOST_TEST_DRIVER}" NATIVE_BOOST_TEST_DRIVER )
+  
+  message( "${NATIVE_PYTHON_EXECUTABLE} ${NATIVE_BOOST_TEST_DRIVER} <CMAKE_CURRENT_BINARY_DIR> cxx_compile_object <OBJECT> ${CMAKE_CXX_COMPILE_OBJECT}"  )
+  
   set(CMAKE_CXX_COMPILE_OBJECT 
-    "${PYTHON_EXECUTABLE} ${BOOST_TEST_DRIVER} <CMAKE_CURRENT_BINARY_DIR> cxx_compile_object <OBJECT> ${CMAKE_CXX_COMPILE_OBJECT}")
+    "${NATIVE_PYTHON_EXECUTABLE} ${NATIVE_BOOST_TEST_DRIVER} <CMAKE_CURRENT_BINARY_DIR> cxx_compile_object <OBJECT> ${CMAKE_CXX_COMPILE_OBJECT}" )
 
   set(CMAKE_CXX_CREATE_SHARED_LIBRARY  
-    "${PYTHON_EXECUTABLE} ${BOOST_TEST_DRIVER} <CMAKE_CURRENT_BINARY_DIR> create_shared_library <TARGET> ${CMAKE_CXX_CREATE_SHARED_LIBRARY}") 
+    "${NATIVE_PYTHON_EXECUTABLE} ${NATIVE_BOOST_TEST_DRIVER} <CMAKE_CURRENT_BINARY_DIR> create_shared_library <TARGET> ${CMAKE_CXX_CREATE_SHARED_LIBRARY}") 
     
   set(CMAKE_CXX_CREATE_STATIC_LIBRARY  
-    "${PYTHON_EXECUTABLE} ${BOOST_TEST_DRIVER} <CMAKE_CURRENT_BINARY_DIR> create_static_library <TARGET> ${CMAKE_CXX_CREATE_STATIC_LIBRARY}") 
+    "${NATIVE_PYTHON_EXECUTABLE} ${NATIVE_BOOST_TEST_DRIVER} <CMAKE_CURRENT_BINARY_DIR> create_static_library <TARGET> ${CMAKE_CXX_CREATE_STATIC_LIBRARY}") 
 
   set(CMAKE_CXX_LINK_EXECUTABLE  
-    "${PYTHON_EXECUTABLE} ${BOOST_TEST_DRIVER} <CMAKE_CURRENT_BINARY_DIR> link_executable <TARGET> ${CMAKE_CXX_LINK_EXECUTABLE}") 
+    "${NATIVE_PYTHON_EXECUTABLE} ${NATIVE_BOOST_TEST_DRIVER} <CMAKE_CURRENT_BINARY_DIR> link_executable <TARGET> ${CMAKE_CXX_LINK_EXECUTABLE}") 
 
   #
   #  Custom targets for talking to the server via xmlrpc
@@ -89,8 +95,8 @@
     COMMAND ${PYTHON_EXECUTABLE} ${BOOST_BUILD_SLAVE_PYTHONPATH}/finish.py
     COMMENT "Slave finishing build"
     )
-
   #
+
   #  Local only:  show what we report to server (our platform description, toolset, etc)
   #
   add_custom_target(slave-info