diff options
| -rw-r--r-- | cmake/cmake.d/03-macros.cmake | 8 | ||||
| -rw-r--r-- | cmake/common.cmake | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/cmake/cmake.d/03-macros.cmake b/cmake/cmake.d/03-macros.cmake index e483a4a..d4fdf7d 100644 --- a/cmake/cmake.d/03-macros.cmake +++ b/cmake/cmake.d/03-macros.cmake @@ -367,7 +367,7 @@ macro(project_targets_populate) endif() list(APPEND BINDINGS_LIST "${P}${OUT}${S}") generate_one_populate_target(${P}${OUT}${S} ${PACKAGE_LIBDIR}) - SET_TARGET_PROPERTIES(${T} PROPERTIES + SET_TARGET_PROPERTIES(${TARGET} PROPERTIES LINK_FLAGS ${BINDINGS_LINK_FLAG} ) elseif(${T} STREQUAL "BINDINGV2") @@ -376,7 +376,7 @@ macro(project_targets_populate) endif() afb_genskel("-2") generate_one_populate_target(${P}${OUT}${S} ${PACKAGE_LIBDIR}) - SET_TARGET_PROPERTIES(${T} PROPERTIES + SET_TARGET_PROPERTIES(${TARGET} PROPERTIES LINK_FLAGS ${BINDINGS_LINK_FLAG} ) elseif(${T} STREQUAL "BINDINGV3") @@ -385,7 +385,7 @@ macro(project_targets_populate) endif() afb_genskel("-3") generate_one_populate_target(${P}${OUT}${S} ${PACKAGE_LIBDIR}) - SET_TARGET_PROPERTIES(${T} PROPERTIES + SET_TARGET_PROPERTIES(${TARGET} PROPERTIES LINK_FLAGS ${BINDINGS_LINK_FLAG} ) elseif(${T} STREQUAL "EXECUTABLE") @@ -542,7 +542,7 @@ macro(wgt_package_build) COMMAND cp ${ICON_PATH} ${PROJECT_PKG_BUILD_DIR}/${PROJECT_ICON} ) add_custom_command(OUTPUT ${PROJECT_PKG_TEST_DIR}/config.xml ${PROJECT_PKG_TEST_DIR}/bin/launcher - COMMAND ${CMAKE_COMMAND} -DINFILE=${TEST_WIDGET_CONFIG_TEMPLATE} -DOUTFILE=${PROJECT_PKG_TEST_DIR}/config.xml -DPROJECT_BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR} -P ${PROJECT_APP_TEMPLATES_DIR}/cmake/configure_file.cmake + COMMAND ${CMAKE_COMMAND} -DINFILE=${TEST_WIDGET_CONFIG_TEMPLATE} -DOUTFILE=${PROJECT_PKG_TEST_DIR}/config.xml -DPROJECT_BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR} -P ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_APP_TEMPLATES_DIR}/cmake/configure_file.cmake COMMAND mkdir -p ${PROJECT_PKG_TEST_DIR}/bin COMMAND cp ${ICON_PATH} ${PROJECT_PKG_TEST_DIR}/${PROJECT_ICON} COMMAND cp ${CMAKE_SOURCE_DIR}/${PROJECT_APP_TEMPLATES_DIR}/test-widget/launcher.sh.in ${PROJECT_PKG_TEST_DIR}/bin/launcher diff --git a/cmake/common.cmake b/cmake/common.cmake index 5bdc645..77ecd3f 100644 --- a/cmake/common.cmake +++ b/cmake/common.cmake @@ -85,7 +85,7 @@ foreach(file ${system_cmakefiles} ${home_cmakefiles} ${project_cmakefiles}) include(${file}) endforeach() -message(STATUS "${Red}You are using the submodule version of app-templates. This version will not be update in the future and you should migrate to the CMake module version. It could be found here: https://gerrit.automotivelinux.org/gerrit/#/admin/projects/src/cmake-apps-module. Using latest SDK with a version > FF include it by default. To migrate deinit the existing app-templates submodule and replace the last line of your config.cmake file with 'include(CMakeAppsHelpers)'. If you directly want to use it, only take the config.sample.cmake file from the CMake module and edit to fit your needs.") +message(STATUS "${Red}You are using the submodule version of app-templates. This version will not be update in the future and you should migrate to the CMake module version. It could be found here: https://gerrit.automotivelinux.org/gerrit/#/admin/projects/src/cmake-apps-module. Using latest SDK with a version > FF include it by default. To migrate deinit the existing app-templates submodule, it could be then be deleted. To finish, replace the last line of your config.cmake file with 'include(CMakeAfbTemplates)'. If you directly want to use it, only take the config.sample.cmake file from the CMake module and edit to fit your needs.${ColourReset}") set_install_prefix() prevent_in_source_build() |