refactor cmake files

producer/api/python/CMakeLists_Linux.cmake

@@ -14,10 +14,11 @@ set (ASAPO_PRODUCER_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../cpp/include)
 configure_files(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} @ONLY)
 file(GENERATE OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/setup.py INPUT ${CMAKE_CURRENT_BINARY_DIR}/setup.py)
 
-
-ADD_CUSTOM_TARGET(python-lib-producer
+ADD_CUSTOM_TARGET(python-lib-producer ALL
         COMMAND ${Python_EXECUTABLE} setup.py build_ext --inplace --force)
 
 ADD_DEPENDENCIES(python-lib-producer asapo-producer)
 
-add_subdirectory(source_dist_linux)
+if (BUILD_PYTHON_PACKAGES)
+    add_subdirectory(dist_linux)
+endif()

producer/api/python/CMakeLists_Windows.cmake

@@ -31,4 +31,4 @@ add_subdirectory(binary_dist_windows)
 
 set (EXTRA_COMPILE_ARGS "['/MT']")
 set (EXTRA_LINK_ARGS "[]")
-add_subdirectory(source_dist_linux)
+add_subdirectory(dist_linux)

producer/api/python/source_dist_linux/CMakeLists.txt → producer/api/python/dist_linux/CMakeLists.txt

@@ -3,19 +3,26 @@ configure_file(MANIFEST.in MANIFEST.in @ONLY)
 
 file(GENERATE OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/setup.py INPUT ${CMAKE_CURRENT_BINARY_DIR}/setup.py)
 
-ADD_CUSTOM_TARGET(python-rpm-producer
+if ("rpm" IN_LIST BUILD_PYTHON_PACKAGES)
+	ADD_CUSTOM_TARGET(python-rpm-producer ALL
 		COMMAND PACKAGE_PREFIX=python- python setup.py bdist_rpm --release=1.${PACKAGE_RELEASE_SUFFIX} --requires=numpy
 		)
 
-ADD_CUSTOM_TARGET(python3-rpm-producer
+	ADD_CUSTOM_TARGET(python3-rpm-producer ALL
 		COMMAND PACKAGE_PREFIX=python3- python3 setup.py bdist_rpm --release=1.${PACKAGE_RELEASE_SUFFIX} --requires=python3-numpy
 		)
+	ADD_DEPENDENCIES(python3-rpm-producer copy_python_dist-producer)
+	ADD_DEPENDENCIES(python-rpm-producer copy_python_dist-producer)
+endif()
 
-ADD_CUSTOM_TARGET(python-dist-producer
+if ("source" IN_LIST BUILD_PYTHON_PACKAGES )
+	ADD_CUSTOM_TARGET(python-dist-producer ALL
         COMMAND ${Python_EXECUTABLE} setup.py sdist
         )
+	ADD_DEPENDENCIES(python-dist-producer copy_python_dist-producer)
+endif()
 
-ADD_CUSTOM_TARGET(copy_python_dist-producer
+ADD_CUSTOM_TARGET(copy_python_dist-producer ALL
         COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/../asapo_wrappers.h ${CMAKE_CURRENT_BINARY_DIR}/.
         COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/../asapo_producer.cpp ${CMAKE_CURRENT_BINARY_DIR}/.
         COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/producer/api/cpp/include ${CMAKE_CURRENT_BINARY_DIR}/include
@@ -27,13 +34,9 @@ ADD_CUSTOM_TARGET(copy_python_dist-producer
         COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:asapo-producer> ${CMAKE_CURRENT_BINARY_DIR}/lib
         )
 
-
 if (UNIX)
 	ADD_DEPENDENCIES(copy_python_dist-producer python-lib-producer)
 ELSE()
 	ADD_DEPENDENCIES(copy_python_dist-producer asapo_producer)
 ENDIF()
 
-ADD_DEPENDENCIES(python-dist-producer copy_python_dist-producer)
-ADD_DEPENDENCIES(python3-rpm-producer copy_python_dist-producer)
-ADD_DEPENDENCIES(python-rpm-producer copy_python_dist-producer)

tests/automatic/bug_fixes/CMakeLists.txt

 if (UNIX)
     add_subdirectory(receiver_cpu_usage)
-    add_subdirectory(consumer_python_memleak)
-    add_subdirectory(error-sending-data-using-callback-method)
+    if (BUILD_PYTHON)
+        add_subdirectory(consumer_python_memleak)
+        add_subdirectory(error-sending-data-using-callback-method)
+    endif()
 endif()
 
 add_subdirectory(producer_send_after_restart)

tests/automatic/bug_fixes/consumer_python_memleak/CMakeLists.txt

@@ -4,7 +4,7 @@ set(TARGET_NAME consumer_python_memleak)
 prepare_asapo()
 
 if (UNIX)
-    get_target_property(PYTHON_LIBS python-lib BINARY_DIR)
+    get_target_property(PYTHON_LIBS python-lib-consumer BINARY_DIR)
 else()
     get_target_property(PYTHON_LIBS asapo_consumer BINARY_DIR)
 endif()

tests/automatic/consumer/CMakeLists.txt

@@ -3,7 +3,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.7) # needed for fixtures
 add_subdirectory(next_multithread_broker)
 add_subdirectory(consumer_api)
 
-if (UNIX OR CMAKE_BUILD_TYPE STREQUAL "Release")
+if (BUILD_PYTHON)
     add_subdirectory(consumer_api_python)
 endif()
 

tests/automatic/consumer/consumer_api_python/CMakeLists.txt

@@ -4,7 +4,7 @@ set(TARGET_NAME consumer_api_python)
 prepare_asapo()
 
 if (UNIX)
-    get_target_property(PYTHON_LIBS python-lib BINARY_DIR)
+    get_target_property(PYTHON_LIBS python-lib-consumer BINARY_DIR)
 else()
     get_target_property(PYTHON_LIBS asapo_consumer BINARY_DIR)
 endif()

tests/automatic/full_chain/CMakeLists.txt

 add_subdirectory(simple_chain)
-if (UNIX OR CMAKE_BUILD_TYPE STREQUAL "Release")
+if (BUILD_PYTHON)
     add_subdirectory(simple_chain_usermeta_python)
     add_subdirectory(send_recv_substreams_python)
 endif()

tests/automatic/full_chain/send_recv_substreams_python/CMakeLists.txt

@@ -2,7 +2,7 @@ set(TARGET_NAME send_recv_substreams_python)
 prepare_asapo()
 
 if (UNIX)
-    get_target_property(PYTHON_LIBS_CONSUMER python-lib BINARY_DIR)
+    get_target_property(PYTHON_LIBS_CONSUMER python-lib-consumer BINARY_DIR)
     get_target_property(PYTHON_LIBS_PRODUCER python-lib-producer BINARY_DIR)
 else()
     get_target_property(PYTHON_LIBS_CONSUMER asapo_consumer BINARY_DIR)

tests/automatic/full_chain/simple_chain_usermeta_python/CMakeLists.txt

@@ -6,7 +6,7 @@ set(TARGET_NAME full_chain_usermeta_python)
 prepare_asapo()
 
 if (UNIX)
-    get_target_property(PYTHON_LIBS python-lib BINARY_DIR)
+    get_target_property(PYTHON_LIBS python-lib-consumer BINARY_DIR)
 else()
     get_target_property(PYTHON_LIBS asapo_consumer BINARY_DIR)
 endif()

tests/automatic/producer/CMakeLists.txt

 add_subdirectory(file_monitor_producer)
 add_subdirectory(beamtime_metadata)
 
-if (UNIX OR CMAKE_BUILD_TYPE STREQUAL "Release")
+if (BUILD_PYTHON)
     add_subdirectory(python_api)
     add_subdirectory(aai)
-
 endif()