You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kp...@apache.org on 2021/09/14 15:17:52 UTC
[qpid-interop-test] branch main updated: Updated min cmake version
for sub-CMakeLists.txt files,
also updated proton PYTHON3PATH for new proton dir
This is an automated email from the ASF dual-hosted git repository.
kpvdr pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-interop-test.git
The following commit(s) were added to refs/heads/main by this push:
new b2f1815 Updated min cmake version for sub-CMakeLists.txt files, also updated proton PYTHON3PATH for new proton dir
b2f1815 is described below
commit b2f181529e8143480e678f6ce9f45ce31100f479
Author: Kim van der Riet <ki...@apache.org>
AuthorDate: Tue Sep 14 11:17:35 2021 -0400
Updated min cmake version for sub-CMakeLists.txt files, also updated proton PYTHON3PATH for new proton dir
---
config.sh.in | 2 +-
docs/CMakeLists.txt | 4 ++--
shims/amqpnetlite/src/CMakeLists.txt | 2 +-
shims/qpid-jms/CMakeLists.txt | 2 +-
shims/qpid-proton-cpp/src/CMakeLists.txt | 2 +-
shims/qpid-proton-python/src/CMakeLists.txt | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/config.sh.in b/config.sh.in
index 3ab336c..fe105c8 100644
--- a/config.sh.in
+++ b/config.sh.in
@@ -35,7 +35,7 @@ py3_found_str="@PYTHON3_FOUND@"
if [[ "${py3_found_str#*-}" == "NOTFOUND" ]]; then
echo "No Python 3.x found, Python 3 shims disabled"
else
- export PYTHON3PATH=@CMAKE_INSTALL_PREFIX@/lib64/proton/bindings/python3:@CMAKE_INSTALL_PREFIX@/lib/@PYTHON3_SITE_DIR_NAME@/site-packages:@CMAKE_INSTALL_PREFIX@/libexec/qpid_interop_test/shims/qpid-proton-python
+ export PYTHON3PATH=@CMAKE_INSTALL_PREFIX@/lib64/proton/bindings/python:@CMAKE_INSTALL_PREFIX@/lib/@PYTHON3_SITE_DIR_NAME@/site-packages:@CMAKE_INSTALL_PREFIX@/libexec/qpid_interop_test/shims/qpid-proton-python
fi
# To run the main program use python 3
export PYTHONPATH=$PYTHON3PATH
diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
index 7fb3253..822ff26 100644
--- a/docs/CMakeLists.txt
+++ b/docs/CMakeLists.txt
@@ -19,6 +19,6 @@
project (qpid-interop-test-doc)
-cmake_minimum_required(VERSION 2.8.7 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.16.3 FATAL_ERROR)
-execute_process(COMMAND asciidoc -d book ${CMAKE_CURRENT_SOURCE_DIR}/users-guide.txt)
\ No newline at end of file
+execute_process(COMMAND asciidoc -d book ${CMAKE_CURRENT_SOURCE_DIR}/users-guide.txt)
diff --git a/shims/amqpnetlite/src/CMakeLists.txt b/shims/amqpnetlite/src/CMakeLists.txt
index 930c737..2bc8352 100644
--- a/shims/amqpnetlite/src/CMakeLists.txt
+++ b/shims/amqpnetlite/src/CMakeLists.txt
@@ -25,7 +25,7 @@
project (qpid-interop-test-amqpnetlite-shims)
-cmake_minimum_required(VERSION 2.8.7 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.16.3 FATAL_ERROR)
# Check for presence of dotnet assembly
diff --git a/shims/qpid-jms/CMakeLists.txt b/shims/qpid-jms/CMakeLists.txt
index b17b4ee..d4fd0d0 100644
--- a/shims/qpid-jms/CMakeLists.txt
+++ b/shims/qpid-jms/CMakeLists.txt
@@ -18,7 +18,7 @@
#
project (qpid-interop-test-qpid-jms-shims)
-cmake_minimum_required(VERSION 2.8.7 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.16.3 FATAL_ERROR)
add_custom_target(jms-shims ALL ${Maven} -DskipTests package
WORKING_DIRECTORY ../../../)
diff --git a/shims/qpid-proton-cpp/src/CMakeLists.txt b/shims/qpid-proton-cpp/src/CMakeLists.txt
index 6bcc310..b8cbde4 100644
--- a/shims/qpid-proton-cpp/src/CMakeLists.txt
+++ b/shims/qpid-proton-cpp/src/CMakeLists.txt
@@ -19,7 +19,7 @@
project (qpid-interop-test-cpp-shim)
-cmake_minimum_required(VERSION 2.8.7 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.16.3 FATAL_ERROR)
message("PROTON_INSTALL_DIR=${PROTON_INSTALL_DIR}")
include_directories(${PROTON_INSTALL_DIR}/include)
diff --git a/shims/qpid-proton-python/src/CMakeLists.txt b/shims/qpid-proton-python/src/CMakeLists.txt
index 4c5fef2..3f2c9a2 100644
--- a/shims/qpid-proton-python/src/CMakeLists.txt
+++ b/shims/qpid-proton-python/src/CMakeLists.txt
@@ -19,4 +19,4 @@
project (qpid-interop-test-python-shim)
-cmake_minimum_required(VERSION 2.8.7 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.16.3 FATAL_ERROR)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org