X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=cmake%2Fcmake.d%2F03-macros.cmake;h=085c249ced34f3ba5d731474bce254058934d49c;hb=08803561c89dd761a26e6a236829c5141056c969;hp=aef5498b3b96a960ddf8a4cda069bd792a601f25;hpb=7dabdeb9c967993167b93860cac4b79a94f27401;p=apps%2Fapp-templates.git

diff --git a/cmake/cmake.d/03-macros.cmake b/cmake/cmake.d/03-macros.cmake
index aef5498..085c249 100644
--- a/cmake/cmake.d/03-macros.cmake
+++ b/cmake/cmake.d/03-macros.cmake
@@ -247,10 +247,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 +261,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 +440,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 +459,21 @@ 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()
+		set(packCMD cd ${PROJECT_PKG_BUILD_DIR} && ${CMAKE_COMMAND} "-E" "tar" "cf" "../${WGT_NAME}.wgt" "--format=zip" "*")
+	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 +533,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)
@@ -536,13 +554,20 @@ macro(project_closing_msg)
 endmacro()
 
 macro(check_version)
-	if(${GIT_PROJECT_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()