Author: rhs
Date: Sat May 10 11:07:22 2014
New Revision: 1593684
URL: http://svn.apache.org/r1593684
Log:
put user's paths after paths from the build tree
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=1593684&r1=1593683&r2=1593684&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/CMakeLists.txt (original)
+++ qpid/proton/trunk/proton-c/CMakeLists.txt Sat May 10 11:07:22 2014
@@ -463,10 +463,10 @@ set (py_bin "${CMAKE_CURRENT_BINARY_DIR}
set (py_bld "${CMAKE_CURRENT_BINARY_DIR}${bld_suffix}") # For windows
set (app_path "${pn_test_bin}/tools/apps/c${bld_suffix}")
set (app_path "${app_path}:${pn_test_root}/tools/apps/python")
-set_path (py_path "$ENV{PATH}:${py_bin}:${py_bld}:${app_path}")
-set_path (py_pythonpath
"$ENV{PYTHONPATH}:${py_root}:${py_src}:${py_bin}:${py_bld}")
+set_path (py_path "${py_bin}:${py_bld}:${app_path}:$ENV{PATH}")
+set_path (py_pythonpath
"${py_root}:${py_src}:${py_bin}:${py_bld}|$ENV{PYTHONPATH}")
if (CMAKE_SYSTEM_NAME STREQUAL Windows)
- set_path (py_pythonpath "${py_pythonpath}:${py_bin}${bld_suffix}")
+ set_path (py_pythonpath "${py_bin}${bld_suffix}:${py_pythonpath}")
endif (CMAKE_SYSTEM_NAME STREQUAL Windows)
add_test (python-test ${PYTHON_EXECUTABLE} ${env_py}
"PATH=${py_path}" "PYTHONPATH=${py_pythonpath}" ${VALGRIND_ENV}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
