Prefix ev-cli targets with PROJECT_NAME

In some cases this prevents the target from being added multiple times Signed-off-by: Kai-Uwe Hermann <kai-uwe.hermann@pionix.de>
EVerest · Jun 24, 2024 · caa4221 · caa4221
1 parent 3213f4f
commit caa4221
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/cmake/ev-cli.cmake b/cmake/ev-cli.cmake
@@ -1,5 +1,5 @@
 macro(setup_ev_cli)
-    add_custom_target(ev-cli)
+    add_custom_target(${PROJECT_NAME}_ev-cli)
     if(${EV_CLI})
         message(FATAL_ERROR "EV_CLI is already defined.")
         return()
@@ -14,7 +14,7 @@ macro(setup_ev_cli)
             message(FATAL_ERROR "Python venv is not active. Please activate the python venv before running this command.")
         endif()
         set(EV_CLI "${${PROJECT_NAME}_PYTHON_VENV_PATH}/bin/ev-cli")
-        add_dependencies(ev-cli
+        add_dependencies(${PROJECT_NAME}_ev-cli
             ev-dev-tools_pip_install_dist
         )
     endif()

diff --git a/cmake/everest-generate.cmake b/cmake/everest-generate.cmake
@@ -284,7 +284,7 @@ function (_ev_add_interfaces)
             "${CHECK_DONE_FILE}"
         DEPENDS
             ${ARGV}
-            ev-cli
+            ${PROJECT_NAME}_ev-cli
         COMMENT
             "Generating/updating interface files ..."
         VERBATIM
@@ -323,7 +323,7 @@ function (_ev_add_types)
             "${CHECK_DONE_FILE}"
         DEPENDS
             ${ARGV}
-            ev-cli
+            ${PROJECT_NAME}_ev-cli
         COMMENT
             "Generating/updating type files ..."
         VERBATIM
@@ -467,7 +467,7 @@ function (ev_add_cpp_module MODULE_NAME)
                         ${RELATIVE_MODULE_DIR}
                 DEPENDS
                     ${MODULE_PATH}/manifest.yaml
-                    ev-cli
+                    ${PROJECT_NAME}_ev-cli
                 WORKING_DIRECTORY
                     ${PROJECT_SOURCE_DIR}
                 COMMENT