[qpid-proton] branch main updated: PROTON-2583: A Better fix that works for Windows as well

[as...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

astitcher pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-proton.git


The following commit(s) were added to refs/heads/main by this push:
     new 6776556ad PROTON-2583: A Better fix that works for Windows as well
6776556ad is described below

commit 6776556adb58d8c22edf9455c802904d1be7a9ff
Author: Andrew Stitcher <as...@apache.org>
AuthorDate: Fri Jul 29 15:50:43 2022 -0400

    PROTON-2583: A Better fix that works for Windows as well
---
 python/CMakeLists.txt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index bd96e94e1..716b32090 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -203,12 +203,14 @@ endif ()
 # python test: python/tests/proton-test
 set (py_src "${CMAKE_CURRENT_SOURCE_DIR}")
 set (py_bin "${CMAKE_CURRENT_BINARY_DIR}")
-set (py_bld "$<TARGET_FILE_DIR:qpid-proton-core>") # For windows
+# These are only needed on Windows due to build differences
+set (py_dll "$<$<PLATFORM_ID:Windows>:$<TARGET_FILE_DIR:cproton>>")
+set (py_bld "$<$<PLATFORM_ID:Windows>:$<TARGET_FILE_DIR:qpid-proton-core>>")
 set (py_tests "${py_src}/tests")
 set (tests_py "${py_src}/../tests/py")
 
 set (py_path ${CMAKE_BINARY_DIR}/c/tools ${py_bld} $ENV{PATH})
-set (py_pythonpath ${py_tests} ${py_src} ${py_bin} ${tests_py} $ENV{PYTHONPATH})
+set (py_pythonpath ${py_tests} ${py_src} ${py_bin} ${py_dll} ${tests_py} $ENV{PYTHONPATH})
 to_native_path ("${py_pythonpath}" py_pythonpath)
 to_native_path ("${py_path}" py_path)
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org