From 20b08da91b144d9c6ca469bb4b8d642b3cc52229 Mon Sep 17 00:00:00 2001
From: Tim Schoof <tim.schoof@desy.de>
Date: Thu, 6 Feb 2020 17:25:49 +0100
Subject: [PATCH] Make python version a cmake variable
---
consumer/api/python/CMakeLists_Linux.cmake | 10 +++-------
consumer/api/python/source_dist_linux/CMakeLists.txt | 4 ++--
producer/api/python/CMakeLists_Linux.cmake | 10 +++-------
producer/api/python/source_dist_linux/CMakeLists.txt | 4 ++--
4 files changed, 10 insertions(+), 18 deletions(-)
diff --git a/consumer/api/python/CMakeLists_Linux.cmake b/consumer/api/python/CMakeLists_Linux.cmake
index 511ac676a..d9a50307b 100644
--- a/consumer/api/python/CMakeLists_Linux.cmake
+++ b/consumer/api/python/CMakeLists_Linux.cmake
@@ -15,13 +15,9 @@ set (ASAPO_CONSUMER_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../cpp/include)
configure_files(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} @ONLY)
-ADD_CUSTOM_TARGET(python-lib2 ALL
- COMMAND python setup.py build_ext --inplace --force)
+ADD_CUSTOM_TARGET(python-lib ALL
+ COMMAND ${Python_EXECUTABLE} setup.py build_ext --inplace --force)
-ADD_CUSTOM_TARGET(python-lib3 ALL
- COMMAND python3 setup.py build_ext --inplace --force)
-
-ADD_DEPENDENCIES(python-lib2 asapo-consumer)
-ADD_DEPENDENCIES(python-lib3 asapo-consumer)
+ADD_DEPENDENCIES(python-lib asapo-consumer)
add_subdirectory(source_dist_linux)
diff --git a/consumer/api/python/source_dist_linux/CMakeLists.txt b/consumer/api/python/source_dist_linux/CMakeLists.txt
index 526146c65..1fb9c9c47 100644
--- a/consumer/api/python/source_dist_linux/CMakeLists.txt
+++ b/consumer/api/python/source_dist_linux/CMakeLists.txt
@@ -3,7 +3,7 @@ configure_file(MANIFEST.in MANIFEST.in @ONLY)
ADD_CUSTOM_TARGET(python-dist ALL
- COMMAND python setup.py sdist
+ COMMAND ${Python_EXECUTABLE} setup.py sdist
)
#get_property(ASAPO_CONSUMER_LIB TARGET asapo-consumer PROPERTY LOCATION)
@@ -21,6 +21,6 @@ ADD_CUSTOM_TARGET(copy_python_dist ALL
)
-ADD_DEPENDENCIES(copy_python_dist python-lib3)
+ADD_DEPENDENCIES(copy_python_dist python-lib)
ADD_DEPENDENCIES(python-dist copy_python_dist)
diff --git a/producer/api/python/CMakeLists_Linux.cmake b/producer/api/python/CMakeLists_Linux.cmake
index 3e0bfcdd7..2f42024ab 100644
--- a/producer/api/python/CMakeLists_Linux.cmake
+++ b/producer/api/python/CMakeLists_Linux.cmake
@@ -15,13 +15,9 @@ set (ASAPO_PRODUCER_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../cpp/include)
configure_files(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} @ONLY)
-ADD_CUSTOM_TARGET(python-lib2-producer ALL
- COMMAND python setup.py build_ext --inplace --force )
+ADD_CUSTOM_TARGET(python-lib-producer ALL
+ COMMAND ${Python_EXECUTABLE} setup.py build_ext --inplace --force)
-ADD_CUSTOM_TARGET(python-lib3-producer ALL
- COMMAND python3 setup.py build_ext --inplace --force)
-
-ADD_DEPENDENCIES(python-lib2-producer asapo-producer)
-ADD_DEPENDENCIES(python-lib3-producer asapo-producer)
+ADD_DEPENDENCIES(python-lib-producer asapo-producer)
add_subdirectory(source_dist_linux)
diff --git a/producer/api/python/source_dist_linux/CMakeLists.txt b/producer/api/python/source_dist_linux/CMakeLists.txt
index 2acfffd0d..89a61bd74 100644
--- a/producer/api/python/source_dist_linux/CMakeLists.txt
+++ b/producer/api/python/source_dist_linux/CMakeLists.txt
@@ -3,7 +3,7 @@ configure_file(MANIFEST.in MANIFEST.in @ONLY)
ADD_CUSTOM_TARGET(python-dist-producer ALL
- COMMAND python setup.py sdist
+ COMMAND ${Python_EXECUTABLE} setup.py sdist
)
ADD_CUSTOM_TARGET(copy_python_dist-producer ALL
@@ -20,6 +20,6 @@ ADD_CUSTOM_TARGET(copy_python_dist-producer ALL
)
-ADD_DEPENDENCIES(copy_python_dist-producer python-lib3-producer)
+ADD_DEPENDENCIES(copy_python_dist-producer python-lib-producer)
ADD_DEPENDENCIES(python-dist-producer copy_python_dist-producer)
--
GitLab