X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=cmake%2Fcmake.d%2F03-macros.cmake;h=ba4c4703865a72dd1b5e7f8375645bec3cddf7c2;hb=6fb38467ca1609a1aa1be865b38648f37861af7e;hp=e99208bca97623700d279ab02585f2268f0321e5;hpb=054d3b870d1b838e5541a9aff00f852698d45a0e;p=apps%2Fapp-templates.git diff --git a/cmake/cmake.d/03-macros.cmake b/cmake/cmake.d/03-macros.cmake index e99208b..ba4c470 100644 --- a/cmake/cmake.d/03-macros.cmake +++ b/cmake/cmake.d/03-macros.cmake @@ -108,6 +108,17 @@ ENDMACRO(LIST_FILTER) # Generic useful macro # ----------------------- +macro(set_install_prefix) + if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT AND INSTALL_PREFIX) + message(STATUS "-- Overwrite the CMAKE default install prefix with ${INSTALL_PREFIX}") + set(CMAKE_INSTALL_PREFIX ${INSTALL_PREFIX} CACHE PATH "Install prefix" FORCE) + endif() + # (BUG!!!) as PKG_CONFIG_PATH does not work [should be an env variable] + # --------------------------------------------------------------------- + set(CMAKE_PREFIX_PATH ${CMAKE_INSTALL_PREFIX}/lib64/pkgconfig ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig CACHE PATH 'Prefix Path list used by pkgconfig module') + set(LD_LIBRARY_PATH ${CMAKE_INSTALL_PREFIX}/lib64 ${CMAKE_INSTALL_PREFIX}/lib CACHE PATH 'Path list where to search for libraries') +endmacro() + macro(PROJECT_TARGET_ADD TARGET_NAME) set_property(GLOBAL APPEND PROPERTY PROJECT_TARGETS ${TARGET_NAME}) set(TARGET_NAME ${TARGET_NAME}) @@ -247,10 +258,13 @@ endmacro() # To be call inside project_targets_populate macro macro(afb_genskel) + if ("${PROJECT_LANGUAGES}" MATCHES "CXX") + list(APPEND GENSKEL_OPTS "--cpp") + endif() if (OPENAPI_DEF) add_custom_command(OUTPUT ${SD}/${OPENAPI_DEF}.h DEPENDS ${SD}/${OPENAPI_DEF}.json - COMMAND afb-genskel ${SD}/${OPENAPI_DEF}.json > ${SD}/${OPENAPI_DEF}.h + COMMAND afb-genskel ${GENSKEL_OPTS} ${SD}/${OPENAPI_DEF}.json > ${SD}/${OPENAPI_DEF}.h ) add_custom_target("${TARGET}_GENSKEL" DEPENDS ${SD}/${OPENAPI_DEF}.h COMMENT "Generating OpenAPI header file ${OPENAPI_DEF}.h") @@ -258,7 +272,7 @@ macro(afb_genskel) else() add_custom_command(OUTPUT ${SD}/${OUT}-apidef.h DEPENDS ${SD}/${OUT}-apidef.json - COMMAND afb-genskel ${SD}/${OUT}-apidef.json > ${SD}/${OUT}-apidef.h + COMMAND afb-genskel ${GENSKEL_OPTS} ${SD}/${OUT}-apidef.json > ${SD}/${OUT}-apidef.h ) add_custom_target("${TARGET}_GENSKEL" DEPENDS ${SD}/${OUT}-apidef.h COMMENT "Generating OpenAPI header file ${OUT}-apidef.h") @@ -437,6 +451,12 @@ macro(wgt_package_build) set(WIDGET_ENTRY_POINT lib) endif() + if(NOT ${CMAKE_BUILD_TYPE} STREQUAL "RELEASE") + string(TOLOWER "${PROJECT_NAME}-${CMAKE_BUILD_TYPE}" WGT_NAME) + else() + string(TOLOWER "${PROJECT_NAME}" WGT_NAME) + endif() + add_custom_command(OUTPUT ${PROJECT_PKG_BUILD_DIR}/config.xml COMMAND ${CMAKE_COMMAND} -DINFILE=${WIDGET_CONFIG_TEMPLATE} -DOUTFILE=${PROJECT_PKG_BUILD_DIR}/config.xml -DPROJECT_BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR} -P ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_APP_TEMPLATES_DIR}/cmake/configure_file.cmake COMMAND cp ${ICON_PATH} ${PROJECT_PKG_BUILD_DIR}/${PROJECT_ICON} @@ -450,14 +470,26 @@ macro(wgt_package_build) file(COPY "${TEMPLATE_DIR}/etc/*" DESTINATION ${PROJECT_PKG_BUILD_DIR}/etc/) endif(${PROJECT_CONF_FILES}) - add_custom_command(OUTPUT ${PROJECT_NAME}.wgt + find_program(wgtpkgCMD "wgtpkg-pack") + if(wgtpkgCMD) + set(packCMD ${wgtpkgCMD} "-f" "-o" "${WGT_NAME}.wgt" ${PROJECT_PKG_BUILD_DIR}) + else() + find_program(wgtpkgCMD "zip") + if(wgtpkgCMD) + set(packCMD ${CMAKE_COMMAND} -E cmake_echo_color --yellow "Warning: Widget will be built using Zip, NOT using the Application Framework widget pack command." && cd ${PROJECT_PKG_BUILD_DIR} && ${wgtpkgCMD} "../${WGT_NAME}.wgt" "*") + else() + set(packCMD ${CMAKE_COMMAND} -E cmake_echo_color --red "Error: No utility found to build a widget. Either install wgtpkg-pack from App Framework or zip command") + endif() + endif() + + add_custom_command(OUTPUT ${WGT_NAME}.wgt DEPENDS ${PROJECT_TARGETS} - COMMAND wgtpkg-pack -f -o ${PROJECT_NAME}.wgt ${PROJECT_PKG_BUILD_DIR} + COMMAND ${packCMD} ) - add_custom_target(widget DEPENDS ${PROJECT_NAME}.wgt) + add_custom_target(widget DEPENDS ${WGT_NAME}.wgt) add_dependencies(widget populate packaging_wgt) - set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.wgt") + set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES "${CMAKE_CURRENT_BINARY_DIR}/${WGT_NAME}.wgt") if(NOT RSYNC_TARGET) message ("${Yellow}.. Warning: RSYNC_TARGET not defined 'make widget-target-install' not instanciated${ColourReset}") @@ -517,6 +549,8 @@ macro(project_subdirs_add) foreach(filename ${filelist}) if(EXISTS "${filename}/CMakeLists.txt") add_subdirectory(${filename}) + elseif(${filename} MATCHES "^.*\\.cmake$") + include(${filename}) endif(EXISTS "${filename}/CMakeLists.txt") endforeach() endmacro(project_subdirs_add) @@ -534,3 +568,23 @@ macro(project_closing_msg) ${PROJECT_TARGETS} populate) endif() endmacro() + +macro(check_version) + if(GIT_PROJECT_VERSION) + if(${GIT_PROJECT_VERSION} VERSION_GREATER ${APP_TEMPLATES_VERSION}) + message(STATUS "${Yellow}.. Your app-templates submodule version seems outdated. You should update it with 'git submodule update --remote ${PROJECT_APP_TEMPLATES_DIR}'. + - App-templates version: ${APP_TEMPLATES_VERSION} + - Project version according AGL Git tag: ${GIT_PROJECT_VERSION}" + ) + endif() + elseif(PROJECT_VERSION) + if(${PROJECT_VERSION} VERSION_GREATER ${APP_TEMPLATES_VERSION}) + message(STATUS "${Yellow}.. Your app-templates submodule version seems outdated. You should update it with 'git submodule update --remote ${PROJECT_APP_TEMPLATES_DIR}'. + - App-templates version: ${APP_TEMPLATES_VERSION} + - Project version according AGL Git tag: ${PROJECT_VERSION}" + ) + endif() + else() + message(STATUS "${Yellow} Your git project repo doesn't have any version tags nor hosted by AGL gerrit infrastructure. Can't compare version between project and app-templates ${APP_TEMPLATES_VERSION} ${ColourReset}") + endif() +endmacro()