Explicitely add version target to dependency list

nasa · Apr 18, 2024 · bf49c69 · bf49c69
1 parent 95e2ec9
commit bf49c69
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/cmake/autocoder/fpp.cmake b/cmake/autocoder/fpp.cmake
@@ -241,9 +241,6 @@ function(fpp_setup_autocode AC_INPUT_FILES)
     # Add in dictionary generation
     if (GENERATED_DICT)
         set(FPRIME_CURRENT_DICTIONARY_FILE_JSON "${GENERATED_DICT}" CACHE INTERNAL "" FORCE)
-        message(STATUS "[DEBUG] Dictionary file: ${FPRIME_CURRENT_DICTIONARY_FILE_JSON}")
-        message(STATUS "[DEBUG] Install prefix : ${CMAKE_INSTALL_PREFIX}")
-        message(STATUS "[DEBUG] CMake bin dir: ${CMAKE_CURRENT_BINARY_DIR}")
         set(LIBRARY_FLAG)
         set(FPRIME_PROJECT_VERSION_FILE "${CMAKE_BINARY_DIR}/versions/version.project")
         set(FPRIME_FRAMEWORK_VERSION_FILE "${CMAKE_BINARY_DIR}/versions/version.framework")
@@ -257,7 +254,11 @@ function(fpp_setup_autocode AC_INPUT_FILES)
                 "--frameworkVersionFile" "${FPRIME_FRAMEWORK_VERSION_FILE}"
                 "--libraryVersionFile" "${FPRIME_LIBRARIES_VERSION_FILE}"
                 ${IMPORTS} ${AC_INPUT_FILES}
-            DEPENDS ${FILE_DEPENDENCIES} ${MODULE_DEPENDENCIES} ${FPRIME_PROJECT_VERSION_FILE} ${FPRIME_FRAMEWORK_VERSION_FILE} ${FPRIME_LIBRARIES_VERSION_FILE}
+            DEPENDS ${FILE_DEPENDENCIES} ${MODULE_DEPENDENCIES} 
+                    ${FPRIME_PROJECT_VERSION_FILE}
+                    ${FPRIME_FRAMEWORK_VERSION_FILE}
+                    ${FPRIME_LIBRARIES_VERSION_FILE}
+                    version
         )
 endif()
     set(AUTOCODER_GENERATED ${GENERATED_AI} ${GENERATED_CPP} ${GENERATED_DICT})

diff --git a/cmake/autocoder/scripts/fpp_to_dict_wrapper.py b/cmake/autocoder/scripts/fpp_to_dict_wrapper.py
@@ -77,10 +77,7 @@ def main():
     ]
     print(cmd_args)
 
-    return subprocess.call(
-        args=cmd_args
-    )
-
+    return subprocess.call(args=cmd_args)
 
 
 if __name__ == "__main__":