X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=cmake%2Fcmake.d%2F03-macros.cmake;h=9df9a101c14b324eaa71f0ca06d004871a652ab1;hb=3965d37f1c51cd2e0f86b160f4145d235f88e55e;hp=2de89f3507e6fc8a182446eaf125355366396f5d;hpb=0487d4437607155c619bcb662aac3fd32a101824;p=apps%2Fapp-templates.git

diff --git a/cmake/cmake.d/03-macros.cmake b/cmake/cmake.d/03-macros.cmake
index 2de89f3..9df9a10 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")
@@ -517,6 +520,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,14 +541,14 @@ 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})
+	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}