Merge pull request #219 from nasa/devel

lestarch: hotfix 1.5.1 PR
nasa · Oct 22, 2020 · 8d6b227 · 8d6b227
2 parents 58ed163 + 6e702b3
commit 8d6b227
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/cmake/target/impl.cmake b/cmake/target/impl.cmake
@@ -37,7 +37,8 @@ function(add_module_target MODULE_NAME TARGET_NAME AC_INPUTS SOURCE_FILES AC_OUT
     add_custom_target("${TARGET_NAME}" 
       COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_CURRENT_SOURCE_DIR}
       ${CMAKE_COMMAND} -E env PYTHONPATH=${PYTHON_AUTOCODER_DIR}/src:${PYTHON_AUTOCODER_DIR}/utils BUILD_ROOT="${FPRIME_BUILD_LOCATIONS_SEP}"
-      PYTHON_AUTOCODER_DIR=${PYTHON_AUTOCODER_DIR}
+      FPRIME_AC_CONSTANTS_FILE="${FPRIME_AC_CONSTANTS_FILE}"
+      PYTHON_AUTOCODER_DIR=${PYTHON_AUTOCODER_DIR} DICTIONARY_DIR=${DICTIONARY_DIR}
       ${FPRIME_FRAMEWORK_PATH}/Autocoders/Python/bin/implgen.py ${AI_XML}
       DEPENDS ${AI_XML}
     )

diff --git a/cmake/target/testimpl.cmake b/cmake/target/testimpl.cmake
@@ -37,7 +37,8 @@ function(add_module_target MODULE_NAME TARGET_NAME AC_INPUTS SOURCE_FILES AC_OUT
     add_custom_target("${TARGET_NAME}" 
       COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_CURRENT_SOURCE_DIR}
       ${CMAKE_COMMAND} -E env PYTHONPATH=${PYTHON_AUTOCODER_DIR}/src:${PYTHON_AUTOCODER_DIR}/utils BUILD_ROOT="${FPRIME_BUILD_LOCATIONS_SEP}"
-      PYTHON_AUTOCODER_DIR=${PYTHON_AUTOCODER_DIR}
+      FPRIME_AC_CONSTANTS_FILE="${FPRIME_AC_CONSTANTS_FILE}"
+      PYTHON_AUTOCODER_DIR=${PYTHON_AUTOCODER_DIR} DICTIONARY_DIR=${DICTIONARY_DIR}
       ${FPRIME_FRAMEWORK_PATH}/Autocoders/Python/bin/testgen.py ${AI_XML}
       DEPENDS ${AI_XML}
     )