Use cet_make_exec() for phlex

phlex/app/CMakeLists.txt

@@ -22,11 +22,15 @@ install(FILES load_module.hpp run.hpp version.hpp DESTINATION include/phlex/app)
 # We'll use C++17's filesystem instead of Boost's
 target_compile_definitions(run_phlex PRIVATE BOOST_DLL_USE_STD_FS)
 
-add_executable(phlex phlex.cpp)
-target_link_libraries(
-  phlex
-  PRIVATE Boost::json Boost::program_options run_phlex phlex::core jsonnet::lib
+cet_make_exec(
+  NAME phlex
+  SOURCE phlex.cpp
+  LIBRARIES
+  Boost::json
+  Boost::program_options
+  run_phlex
+  phlex::core
+  jsonnet::lib
 )
 
 set_target_properties(phlex PROPERTIES INSTALL_RPATH "$ORIGIN/../lib")
-install(TARGETS phlex RUNTIME DESTINATION bin)

test/benchmarks/CMakeLists.txt

@@ -43,7 +43,7 @@ foreach(
       benchmark:${I}
       HANDBUILT
       TEST_EXEC
-      phlex
+      phlex::phlex
       TEST_ARGS
       -c
       ${CMAKE_CURRENT_SOURCE_DIR}/benchmark-${I}.jsonnet

test/max-parallelism/CMakeLists.txt

@@ -11,7 +11,7 @@ cet_test(
   job:check_parallelism_default
   HANDBUILT
   TEST_EXEC
-  phlex
+  phlex::phlex
   TEST_ARGS
   -c
   ${CMAKE_CURRENT_BINARY_DIR}/check_parallelism_default.jsonnet
@@ -25,7 +25,7 @@ cet_test(
   job:check_parallelism_cli
   HANDBUILT
   TEST_EXEC
-  phlex
+  phlex::phlex
   TEST_ARGS
   -c
   ${CMAKE_CURRENT_BINARY_DIR}/check_parallelism_cli.jsonnet
@@ -41,7 +41,7 @@ cet_test(
   job:check_parallelism_config
   HANDBUILT
   TEST_EXEC
-  phlex
+  phlex::phlex
   TEST_ARGS
   -c
   ${CMAKE_CURRENT_BINARY_DIR}/check_parallelism_config.jsonnet
@@ -59,7 +59,7 @@ cet_test(
   job:check_parallelism_cli_over_config
   HANDBUILT
   TEST_EXEC
-  phlex
+  phlex::phlex
   TEST_ARGS
   -c
   ${CMAKE_CURRENT_BINARY_DIR}/check_parallelism_cli_over_config.jsonnet

test/mock-workflow/CMakeLists.txt

@@ -24,7 +24,7 @@ cet_test(
   ${TEST_NAME}
   HANDBUILT
   TEST_EXEC
-  phlex
+  phlex::phlex
   TEST_ARGS
   -c
   ${CMAKE_CURRENT_SOURCE_DIR}/${TEST_NAME}.jsonnet

test/plugins/CMakeLists.txt

@@ -11,7 +11,7 @@ cet_test(
   job:add
   HANDBUILT
   TEST_EXEC
-  phlex
+  phlex::phlex
   TEST_ARGS
   -c
   ${CMAKE_CURRENT_SOURCE_DIR}/add.jsonnet

test/python/CMakeLists.txt

@@ -104,24 +104,27 @@ set(ACTIVE_PY_CPHLEX_TESTS "")
 # numpy support if installed
 if(HAS_NUMPY)
   # phlex-based tests that require numpy support
-  add_test(NAME py:vec COMMAND phlex -c ${CMAKE_CURRENT_SOURCE_DIR}/pyvec.jsonnet)
+  add_test(NAME py:vec COMMAND phlex::phlex -c ${CMAKE_CURRENT_SOURCE_DIR}/pyvec.jsonnet)
   list(APPEND ACTIVE_PY_CPHLEX_TESTS py:vec)
 
-  add_test(NAME py:vectypes COMMAND phlex -c ${CMAKE_CURRENT_SOURCE_DIR}/pyvectypes.jsonnet)
+  add_test(NAME py:vectypes COMMAND phlex::phlex -c ${CMAKE_CURRENT_SOURCE_DIR}/pyvectypes.jsonnet)
   list(APPEND ACTIVE_PY_CPHLEX_TESTS py:vectypes)
 
-  add_test(NAME py:callback3 COMMAND phlex -c ${CMAKE_CURRENT_SOURCE_DIR}/pycallback3.jsonnet)
+  add_test(
+    NAME py:callback3
+    COMMAND phlex::phlex -c ${CMAKE_CURRENT_SOURCE_DIR}/pycallback3.jsonnet
+  )
   list(APPEND ACTIVE_PY_CPHLEX_TESTS py:callback3)
 
   # Expect failure for these tests (check for error propagation and type checking)
-  add_test(NAME py:raise COMMAND phlex -c ${CMAKE_CURRENT_SOURCE_DIR}/pyraise.jsonnet)
+  add_test(NAME py:raise COMMAND phlex::phlex -c ${CMAKE_CURRENT_SOURCE_DIR}/pyraise.jsonnet)
   set_tests_properties(
     py:raise
     PROPERTIES PASS_REGULAR_EXPRESSION "RuntimeError: Intentional failure"
   )
   list(APPEND ACTIVE_PY_CPHLEX_TESTS py:raise)
 
-  add_test(NAME py:badbool COMMAND phlex -c ${CMAKE_CURRENT_SOURCE_DIR}/pybadbool.jsonnet)
+  add_test(NAME py:badbool COMMAND phlex::phlex -c ${CMAKE_CURRENT_SOURCE_DIR}/pybadbool.jsonnet)
   set_tests_properties(
     py:badbool
     PROPERTIES
@@ -130,7 +133,7 @@ if(HAS_NUMPY)
   )
   list(APPEND ACTIVE_PY_CPHLEX_TESTS py:badbool)
 
-  add_test(NAME py:badint COMMAND phlex -c ${CMAKE_CURRENT_SOURCE_DIR}/pybadint.jsonnet)
+  add_test(NAME py:badint COMMAND phlex::phlex -c ${CMAKE_CURRENT_SOURCE_DIR}/pybadint.jsonnet)
   set_tests_properties(
     py:badint
     PROPERTIES
@@ -139,7 +142,7 @@ if(HAS_NUMPY)
   )
   list(APPEND ACTIVE_PY_CPHLEX_TESTS py:badint)
 
-  add_test(NAME py:baduint COMMAND phlex -c ${CMAKE_CURRENT_SOURCE_DIR}/pybaduint.jsonnet)
+  add_test(NAME py:baduint COMMAND phlex::phlex -c ${CMAKE_CURRENT_SOURCE_DIR}/pybaduint.jsonnet)
   set_tests_properties(
     py:baduint
     PROPERTIES
@@ -150,7 +153,7 @@ if(HAS_NUMPY)
 
   add_test(
     NAME py:mismatch_variant
-    COMMAND phlex -c ${CMAKE_CURRENT_SOURCE_DIR}/pymismatch_variant.jsonnet
+    COMMAND phlex::phlex -c ${CMAKE_CURRENT_SOURCE_DIR}/pymismatch_variant.jsonnet
   )
   set_tests_properties(
     py:mismatch_variant
@@ -159,10 +162,10 @@ if(HAS_NUMPY)
   )
   list(APPEND ACTIVE_PY_CPHLEX_TESTS py:mismatch_variant)
 
-  add_test(NAME py:veclists COMMAND phlex -c ${CMAKE_CURRENT_SOURCE_DIR}/pyveclists.jsonnet)
+  add_test(NAME py:veclists COMMAND phlex::phlex -c ${CMAKE_CURRENT_SOURCE_DIR}/pyveclists.jsonnet)
   list(APPEND ACTIVE_PY_CPHLEX_TESTS py:veclists)
 
-  add_test(NAME py:types COMMAND phlex -c ${CMAKE_CURRENT_SOURCE_DIR}/pytypes.jsonnet)
+  add_test(NAME py:types COMMAND phlex::phlex -c ${CMAKE_CURRENT_SOURCE_DIR}/pytypes.jsonnet)
   list(APPEND ACTIVE_PY_CPHLEX_TESTS py:types)
 endif()
 
@@ -171,16 +174,16 @@ add_library(cppsource4py MODULE source.cpp)
 target_link_libraries(cppsource4py PRIVATE phlex::module)
 
 # phlex-based tests (no cppyy dependency)
-add_test(NAME py:add COMMAND phlex -c ${CMAKE_CURRENT_SOURCE_DIR}/pyadd.jsonnet)
+add_test(NAME py:add COMMAND phlex::phlex -c ${CMAKE_CURRENT_SOURCE_DIR}/pyadd.jsonnet)
 list(APPEND ACTIVE_PY_CPHLEX_TESTS py:add)
 
-add_test(NAME py:config COMMAND phlex -c ${CMAKE_CURRENT_SOURCE_DIR}/pyconfig.jsonnet)
+add_test(NAME py:config COMMAND phlex::phlex -c ${CMAKE_CURRENT_SOURCE_DIR}/pyconfig.jsonnet)
 list(APPEND ACTIVE_PY_CPHLEX_TESTS py:config)
 
-add_test(NAME py:reduce COMMAND phlex -c ${CMAKE_CURRENT_SOURCE_DIR}/pyreduce.jsonnet)
+add_test(NAME py:reduce COMMAND phlex::phlex -c ${CMAKE_CURRENT_SOURCE_DIR}/pyreduce.jsonnet)
 list(APPEND ACTIVE_PY_CPHLEX_TESTS py:reduce)
 
-add_test(NAME py:coverage COMMAND phlex -c ${CMAKE_CURRENT_SOURCE_DIR}/pycoverage.jsonnet)
+add_test(NAME py:coverage COMMAND phlex::phlex -c ${CMAKE_CURRENT_SOURCE_DIR}/pycoverage.jsonnet)
 list(APPEND ACTIVE_PY_CPHLEX_TESTS py:coverage)
 
 add_test(
@@ -236,7 +239,7 @@ set_tests_properties(${ACTIVE_PY_CPHLEX_TESTS} PROPERTIES ENVIRONMENT "${PYTHON_
 set(PY_VIRTUAL_ENV_DIR ${CMAKE_CURRENT_BINARY_DIR}/py_virtual_env)
 execute_process(COMMAND python -m venv ${PY_VIRTUAL_ENV_DIR})
 configure_file(pysyspath.jsonnet.in pysyspath.jsonnet @ONLY)
-add_test(NAME py:syspath COMMAND phlex -c ${CMAKE_CURRENT_BINARY_DIR}/pysyspath.jsonnet)
+add_test(NAME py:syspath COMMAND phlex::phlex -c ${CMAKE_CURRENT_BINARY_DIR}/pysyspath.jsonnet)
 
 # Activate the Python virtual environment "by hand".  Requires setting the VIRTUAL_ENV
 # environment variable and prepending to the PATH environment variable.