Skip to content
Snippets Groups Projects
Commit 20b08da9 authored by Tim Schoof's avatar Tim Schoof Committed by Sergey Yakubov
Browse files

Make python version a cmake variable

parent 5af4dcca
No related branches found
No related tags found
No related merge requests found
...@@ -15,13 +15,9 @@ set (ASAPO_CONSUMER_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../cpp/include) ...@@ -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) configure_files(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} @ONLY)
ADD_CUSTOM_TARGET(python-lib2 ALL ADD_CUSTOM_TARGET(python-lib ALL
COMMAND python setup.py build_ext --inplace --force) COMMAND ${Python_EXECUTABLE} setup.py build_ext --inplace --force)
ADD_CUSTOM_TARGET(python-lib3 ALL ADD_DEPENDENCIES(python-lib asapo-consumer)
COMMAND python3 setup.py build_ext --inplace --force)
ADD_DEPENDENCIES(python-lib2 asapo-consumer)
ADD_DEPENDENCIES(python-lib3 asapo-consumer)
add_subdirectory(source_dist_linux) add_subdirectory(source_dist_linux)
...@@ -3,7 +3,7 @@ configure_file(MANIFEST.in MANIFEST.in @ONLY) ...@@ -3,7 +3,7 @@ configure_file(MANIFEST.in MANIFEST.in @ONLY)
ADD_CUSTOM_TARGET(python-dist ALL 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) #get_property(ASAPO_CONSUMER_LIB TARGET asapo-consumer PROPERTY LOCATION)
...@@ -21,6 +21,6 @@ ADD_CUSTOM_TARGET(copy_python_dist ALL ...@@ -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) ADD_DEPENDENCIES(python-dist copy_python_dist)
...@@ -15,13 +15,9 @@ set (ASAPO_PRODUCER_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../cpp/include) ...@@ -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) configure_files(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} @ONLY)
ADD_CUSTOM_TARGET(python-lib2-producer ALL ADD_CUSTOM_TARGET(python-lib-producer ALL
COMMAND python setup.py build_ext --inplace --force ) COMMAND ${Python_EXECUTABLE} setup.py build_ext --inplace --force)
ADD_CUSTOM_TARGET(python-lib3-producer ALL ADD_DEPENDENCIES(python-lib-producer asapo-producer)
COMMAND python3 setup.py build_ext --inplace --force)
ADD_DEPENDENCIES(python-lib2-producer asapo-producer)
ADD_DEPENDENCIES(python-lib3-producer asapo-producer)
add_subdirectory(source_dist_linux) add_subdirectory(source_dist_linux)
...@@ -3,7 +3,7 @@ configure_file(MANIFEST.in MANIFEST.in @ONLY) ...@@ -3,7 +3,7 @@ configure_file(MANIFEST.in MANIFEST.in @ONLY)
ADD_CUSTOM_TARGET(python-dist-producer ALL 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 ADD_CUSTOM_TARGET(copy_python_dist-producer ALL
...@@ -20,6 +20,6 @@ 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) ADD_DEPENDENCIES(python-dist-producer copy_python_dist-producer)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment