Author: cliffjansen
Date: Fri Mar 22 01:38:00 2013
New Revision: 1459606
URL: http://svn.apache.org/r1459606
Log:
PROTON-275: restore environment paths and ctest call for Windows
Modified:
qpid/proton/trunk/proton-c/CMakeLists.txt
Modified: qpid/proton/trunk/proton-c/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/CMakeLists.txt?rev=1459606&r1=1459605&r2=1459606&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/CMakeLists.txt (original)
+++ qpid/proton/trunk/proton-c/CMakeLists.txt Fri Mar 22 01:38:00 2013
@@ -329,12 +329,15 @@ endif(MSVC)
if (CMAKE_SYSTEM_NAME STREQUAL Windows)
- # Substitute windows separators in path and remove empty entries
+ # Substitute windows separators in path and remove empty entries.
+ # Replace necessary colons after windows drive letters.
function(set_path result path)
- string (REGEX REPLACE "^:" "" path "${path}")
- string (REGEX REPLACE "::" ":" path "${path}")
- string (REGEX REPLACE "\\\\" "/" path "${path}")
string (REGEX REPLACE ":" ";" path "${path}")
+ string (REGEX REPLACE ";;" ";" path "${path}")
+ string (REGEX REPLACE "^;" "" path "${path}")
+ string (REGEX REPLACE "\\\\" "/" path "${path}")
+ string (REGEX REPLACE ";([a-zA-Z]);" ";\\1:" path "${path}")
+ string (REGEX REPLACE "^([a-zA-Z]);" "\\1:" path "${path}")
set (${result} ${path} PARENT_SCOPE)
endfunction()
@@ -359,9 +362,11 @@ set (py_bin "${CMAKE_CURRENT_BINARY_DIR}
set (py_bld "${CMAKE_CURRENT_BINARY_DIR}${bld_suffix}") # For windows
set_path (py_path "$ENV{PATH}:${py_bin}:${py_bld}")
set_path (py_pythonpath
"$ENV{PYTHONPATH}:${py_root}:${py_src}:${py_bin}:${py_bld}")
-
+if (CMAKE_SYSTEM_NAME STREQUAL Windows)
+ set_path (py_pythonpath "${py_pythonpath}:${py_bin}${bld_suffix}")
+endif (CMAKE_SYSTEM_NAME STREQUAL Windows)
add_test (python-test python ${env_py} "PATH=${py_path}"
"PYTHONPATH=${py_pythonpath}"
- "${py_root}/proton-test")
+ ${PYTHON_EXECUTABLE} "${py_root}/proton-test")
find_program(ruby_exe "ruby")
if (ruby_exe)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
