From bd1ed0e4ab036d68e2ed225fe3bb2424ef6d37c0 Mon Sep 17 00:00:00 2001 From: Kyle Knoepfel Date: Thu, 18 Dec 2025 16:23:47 -0600 Subject: [PATCH 1/4] Make sure that plugins are installed --- form/CMakeLists.txt | 2 ++ plugins/CMakeLists.txt | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/form/CMakeLists.txt b/form/CMakeLists.txt index e7b3ed99c..ddbe7652d 100644 --- a/form/CMakeLists.txt +++ b/form/CMakeLists.txt @@ -33,3 +33,5 @@ add_library(form_module MODULE form_module.cpp) target_link_libraries(form_module PRIVATE phlex::module form) target_include_directories(form_module PRIVATE ${PROJECT_SOURCE_DIR}) + +install(TARGETS form_module LIBRARY DESTINATION lib) diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index 02321dd54..63a32a9e5 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -6,5 +6,9 @@ add_subdirectory(python) add_library(layer_generator layer_generator.cpp) target_link_libraries(layer_generator PRIVATE phlex::core) +install(TARGETS layer_generator LIBRARY) + add_library(generate_layers MODULE generate_layers.cpp) target_link_libraries(generate_layers PRIVATE phlex::module layer_generator) + +install(TARGETS generate_layers LIBRARY DESTINATION lib) From a42a7c158a8c573490c8652ce619f4f0ae461720 Mon Sep 17 00:00:00 2001 From: Kyle Knoepfel Date: Thu, 18 Dec 2025 16:58:45 -0600 Subject: [PATCH 2/4] Do not install FetchContent packages --- CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8331b102f..03814efa8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,6 +8,7 @@ FetchContent_Declare( GIT_REPOSITORY https://github.com/FNALssi/cetmodules GIT_TAG 4.01.01 GIT_SHALLOW ON + EXCLUDE_FROM_ALL # Do not install FIND_PACKAGE_ARGS 4.01.01 ) # ... and the Catch2 unit testing framework @@ -16,6 +17,7 @@ FetchContent_Declare( GIT_REPOSITORY https://github.com/catchorg/Catch2.git GIT_TAG v3.10.0 GIT_SHALLOW ON + EXCLUDE_FROM_ALL # Do not install FIND_PACKAGE_ARGS ) # ... and Microsoft's C++ Guideline Support Library @@ -24,6 +26,7 @@ FetchContent_Declare( GIT_REPOSITORY https://github.com/microsoft/GSL GIT_TAG v4.2.0 GIT_SHALLOW ON + EXCLUDE_FROM_ALL # Do not install FIND_PACKAGE_ARGS NAMES Microsoft.GSL ) # ... and the Mimic C++ mocking framework @@ -32,6 +35,7 @@ FetchContent_Declare( GIT_REPOSITORY https://github.com/DNKpp/mimicpp GIT_TAG v8 GIT_SHALLOW ON + EXCLUDE_FROM_ALL # Do not install FIND_PACKAGE_ARGS ) From af66dd6e99c4df6a4cd3e8f551b03176c5c097ff Mon Sep 17 00:00:00 2001 From: Kyle Knoepfel Date: Fri, 19 Dec 2025 10:46:31 -0600 Subject: [PATCH 3/4] Install missing headers and pymodule --- phlex/CMakeLists.txt | 16 ++++++++++++++-- phlex/core/CMakeLists.txt | 11 +++++++++++ phlex/metaprogramming/CMakeLists.txt | 14 +++++++++++++- plugins/python/CMakeLists.txt | 2 ++ 4 files changed, 40 insertions(+), 3 deletions(-) diff --git a/phlex/CMakeLists.txt b/phlex/CMakeLists.txt index 1c03dcb54..5ff234374 100644 --- a/phlex/CMakeLists.txt +++ b/phlex/CMakeLists.txt @@ -22,17 +22,29 @@ cet_make_library( install(FILES concurrency.hpp module.hpp source.hpp DESTINATION include/phlex) +cet_make_library( + LIBRARY_NAME + phlex_configuration_internal + SHARED + SOURCE + configuration.cpp + LIBRARIES + PRIVATE + Boost::json + phlex::core + ) + cet_make_library( LIBRARY_NAME phlex_configuration EXPORT_NAME configuration INTERFACE - SOURCE - configuration.cpp + NO_SOURCE LIBRARIES Boost::json phlex::core + phlex_configuration_internal ) install(FILES configuration.hpp DESTINATION include/phlex) diff --git a/phlex/core/CMakeLists.txt b/phlex/core/CMakeLists.txt index 20c0443a0..d4fa80688 100644 --- a/phlex/core/CMakeLists.txt +++ b/phlex/core/CMakeLists.txt @@ -49,6 +49,7 @@ install( declared_observer.hpp declared_output.hpp declared_predicate.hpp + declared_provider.hpp declared_transform.hpp declared_unfold.hpp edge_creation_policy.hpp @@ -72,6 +73,16 @@ install( upstream_predicates.hpp DESTINATION include/phlex/core ) +install( + FILES fold/send.hpp + DESTINATION include/phlex/core/fold + ) +install( + FILES detail/make_algorithm_name.hpp + detail/maybe_predicates.hpp + detail/filter_impl.hpp + DESTINATION include/phlex/core/detail + ) target_include_directories(phlex_core PRIVATE ${PROJECT_SOURCE_DIR}) # AppleClang 15.0 still treats std::views::join as experimental diff --git a/phlex/metaprogramming/CMakeLists.txt b/phlex/metaprogramming/CMakeLists.txt index e8692ab18..460007517 100644 --- a/phlex/metaprogramming/CMakeLists.txt +++ b/phlex/metaprogramming/CMakeLists.txt @@ -10,8 +10,20 @@ cet_make_library( Boost::boost ) -install(FILES delegate.hpp type_deduction.hpp +install(FILES + delegate.hpp + type_deduction.hpp DESTINATION include/phlex/metaprogramming ) +install(FILES + detail/basic_concepts.hpp + detail/ctor_reflect_types.hpp + detail/number_output_objects.hpp + detail/number_parameters.hpp + detail/parameter_types.hpp + detail/return_type.hpp + DESTINATION include/phlex/metaprogramming/detail + ) + add_library(phlex::metaprogramming ALIAS phlex_metaprogramming_int) diff --git a/plugins/python/CMakeLists.txt b/plugins/python/CMakeLists.txt index 5b32c49f6..f43e12c93 100644 --- a/plugins/python/CMakeLists.txt +++ b/plugins/python/CMakeLists.txt @@ -69,6 +69,8 @@ except ImportError: PUBLIC Python::Python ) + install(TARGETS pymodule LIBRARY DESTINATION lib) + # numpy support if installed if(HAS_NUMPY) From 2beac4801ede8ac9125ed0ab976454ff611de842 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 19 Dec 2025 16:48:26 +0000 Subject: [PATCH 4/4] Apply cmake-format fixes --- phlex/core/CMakeLists.txt | 14 ++++---------- phlex/metaprogramming/CMakeLists.txt | 19 +++++++------------ 2 files changed, 11 insertions(+), 22 deletions(-) diff --git a/phlex/core/CMakeLists.txt b/phlex/core/CMakeLists.txt index d4fa80688..1b498497a 100644 --- a/phlex/core/CMakeLists.txt +++ b/phlex/core/CMakeLists.txt @@ -73,16 +73,10 @@ install( upstream_predicates.hpp DESTINATION include/phlex/core ) -install( - FILES fold/send.hpp - DESTINATION include/phlex/core/fold - ) -install( - FILES detail/make_algorithm_name.hpp - detail/maybe_predicates.hpp - detail/filter_impl.hpp - DESTINATION include/phlex/core/detail - ) +install(FILES fold/send.hpp DESTINATION include/phlex/core/fold) +install(FILES detail/make_algorithm_name.hpp detail/maybe_predicates.hpp + detail/filter_impl.hpp DESTINATION include/phlex/core/detail + ) target_include_directories(phlex_core PRIVATE ${PROJECT_SOURCE_DIR}) # AppleClang 15.0 still treats std::views::join as experimental diff --git a/phlex/metaprogramming/CMakeLists.txt b/phlex/metaprogramming/CMakeLists.txt index 460007517..b6a355982 100644 --- a/phlex/metaprogramming/CMakeLists.txt +++ b/phlex/metaprogramming/CMakeLists.txt @@ -10,20 +10,15 @@ cet_make_library( Boost::boost ) -install(FILES - delegate.hpp - type_deduction.hpp +install(FILES delegate.hpp type_deduction.hpp DESTINATION include/phlex/metaprogramming ) -install(FILES - detail/basic_concepts.hpp - detail/ctor_reflect_types.hpp - detail/number_output_objects.hpp - detail/number_parameters.hpp - detail/parameter_types.hpp - detail/return_type.hpp - DESTINATION include/phlex/metaprogramming/detail - ) +install( + FILES detail/basic_concepts.hpp detail/ctor_reflect_types.hpp + detail/number_output_objects.hpp detail/number_parameters.hpp + detail/parameter_types.hpp detail/return_type.hpp + DESTINATION include/phlex/metaprogramming/detail + ) add_library(phlex::metaprogramming ALIAS phlex_metaprogramming_int)