diff options
| author |   Li Xiaoming <lixm.fnst@cn.fujitsu.com> | 2019-09-06 15:08:37 +0800 |
|---|---|---|
| committer | Li Xiaoming <lixm.fnst@cn.fujitsu.com> | 2019-09-06 15:08:37 +0800 |
| commit | ec168c395458635826b0b3c5206cbbdd1f291628 (patch) | |
| tree | 0cae38530c08fc96412025ee5024b2aba2015938 | |
| parent | e22906381417ebeb9223e164f77ee8f0ce7913f7 (diff) | |
fix(4-extra_targets.cmake): fix filename template in command & depend
Bug-AGL: SPEC-2805
Change-Id: I3aad4168c199e2936bdfeedc40f85533eb20f069
Signed-off-by: Li Xiaoming <lixm.fnst@cn.fujitsu.com>
| -rw-r--r-- | src/cmake/cmake.d/04-extra_targets.cmake | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/cmake/cmake.d/04-extra_targets.cmake b/src/cmake/cmake.d/04-extra_targets.cmake index 202cfa7..0dcbd7e 100644 --- a/src/cmake/cmake.d/04-extra_targets.cmake +++ b/src/cmake/cmake.d/04-extra_targets.cmake @@ -76,11 +76,11 @@ add_custom_command(OUTPUT ${PROJECT_TEST_DIR} DEPENDS ${TEMPLATE_DIR}/test/CMakeLists.txt.in ${TEMPLATE_DIR}/test/afb-test/CMakeLists.txt.in ${TEMPLATE_DIR}/test/afb-test/etc/CMakeLists.txt.in - ${TEMPLATE_DIR}/test/afb-test/etc/aft-agl-helloworld.json.in + ${TEMPLATE_DIR}/test/afb-test/etc/aft-agl-${PROJECT_NAME}.json.in ${TEMPLATE_DIR}/test/afb-test/fixtures/CMakeLists.txt.in - ${TEMPLATE_DIR}/test/afb-test/fixtures/mapi_helloworld.lua.in + ${TEMPLATE_DIR}/test/afb-test/fixtures/mapi_${PROJECT_NAME}.lua.in ${TEMPLATE_DIR}/test/afb-test/tests/CMakeLists.txt.in - ${TEMPLATE_DIR}/test/afb-test/tests/helloworld.lua.in + ${TEMPLATE_DIR}/test/afb-test/tests/${PROJECT_NAME}.lua.in ${TEMPLATE_DIR}/test/afb-test/tests/mapi_tests.lua.in @@ -100,7 +100,7 @@ add_custom_command(OUTPUT ${PROJECT_TEST_DIR} -DPROJECT_BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR} -P ${PROJECT_APP_TEMPLATES_DIR}/cmake/configure_file.cmake || true COMMAND [ ! -f "${PROJECT_TEST_DIR}/afb-test/etc/aft-agl-${PROJECT_NAME}.json" ] && - ${CMAKE_COMMAND} -DINFILE=${TEMPLATE_DIR}/test/afb-test/etc/aft-agl-helloworld.json.in + ${CMAKE_COMMAND} -DINFILE=${TEMPLATE_DIR}/test/afb-test/etc/aft-agl-${PROJECT_NAME}.json.in -DOUTFILE=${PROJECT_TEST_DIR}/afb-test/etc/aft-agl-${PROJECT_NAME}.json -DPROJECT_BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR} -P ${PROJECT_APP_TEMPLATES_DIR}/cmake/configure_file.cmake || true @@ -110,7 +110,7 @@ add_custom_command(OUTPUT ${PROJECT_TEST_DIR} -DPROJECT_BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR} -P ${PROJECT_APP_TEMPLATES_DIR}/cmake/configure_file.cmake || true COMMAND [ ! -f "${PROJECT_TEST_DIR}/afb-test/fixtures/mapi_${PROJECT_NAME}.lua" ] && - ${CMAKE_COMMAND} -DINFILE=${TEMPLATE_DIR}/test/afb-test/fixtures/mapi_helloworld.lua.in + ${CMAKE_COMMAND} -DINFILE=${TEMPLATE_DIR}/test/afb-test/fixtures/mapi_${PROJECT_NAME}.lua.in -DOUTFILE=${PROJECT_TEST_DIR}/afb-test/fixtures/mapi_${PROJECT_NAME}.lua -DPROJECT_BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR} -P ${PROJECT_APP_TEMPLATES_DIR}/cmake/configure_file.cmake || true @@ -120,7 +120,7 @@ add_custom_command(OUTPUT ${PROJECT_TEST_DIR} -DPROJECT_BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR} -P ${PROJECT_APP_TEMPLATES_DIR}/cmake/configure_file.cmake || true COMMAND [ ! -f "${PROJECT_TEST_DIR}/afb-test/tests/${PROJECT_NAME}.lua" ] && - ${CMAKE_COMMAND} -DINFILE=${TEMPLATE_DIR}/test/afb-test/tests/helloworld.lua.in + ${CMAKE_COMMAND} -DINFILE=${TEMPLATE_DIR}/test/afb-test/tests/${PROJECT_NAME}.lua.in -DOUTFILE=${PROJECT_TEST_DIR}/afb-test/tests/${PROJECT_NAME}.lua -DPROJECT_BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR} -P ${PROJECT_APP_TEMPLATES_DIR}/cmake/configure_file.cmake || true @@ -131,4 +131,4 @@ add_custom_command(OUTPUT ${PROJECT_TEST_DIR} -P ${PROJECT_APP_TEMPLATES_DIR}/cmake/configure_file.cmake || true ) -add_custom_target(test-tree DEPENDS ${PROJECT_TEST_DIR})
\ No newline at end of file +add_custom_target(test-tree DEPENDS ${PROJECT_TEST_DIR}) |