X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=cmake%2Fcmake.d%2F03-macros.cmake;h=6dd9d0ae8131f371871cafa872e737ae9b5e90c1;hb=refs%2Ftags%2Fflounder%2F5.99.3;hp=62e579034c6dbe4b16dfc2b357a703348ac4c4fe;hpb=22fee6b6b2241421f3471f0f842d6349272790de;p=apps%2Fapp-templates.git

diff --git a/cmake/cmake.d/03-macros.cmake b/cmake/cmake.d/03-macros.cmake
index 62e5790..6dd9d0a 100644
--- a/cmake/cmake.d/03-macros.cmake
+++ b/cmake/cmake.d/03-macros.cmake
@@ -22,8 +22,103 @@
 #     Do not change this cmake template
 #     Customise your preferences in "./conf.d/cmake/config.cmake"
 #--------------------------------------------------------------------------
+# CMake 3.6 imported macros to simulate list(FILTER ...) subcommand
+#--------------------------------------------------------------------------
+MACRO(prevent_in_source_build)
+	execute_process(COMMAND rm -rf ${CMAKE_SOURCE_DIR}/CMakeCache.txt ${CMAKE_SOURCE_DIR}/CMakeCacheForScript.cmake ${CMAKE_SOURCE_DIR}/CMakeFiles ${CMAKE_SOURCE_DIR}/cmake_install.cmake)
+
+	get_filename_component(srcdir "${CMAKE_SOURCE_DIR}" REALPATH)
+	get_filename_component(bindir "${CMAKE_BINARY_DIR}" REALPATH)
+
+	if(${srcdir} STREQUAL ${bindir})
+		message(FATAL_ERROR "${Red}**** ERROR: You trying to build the project from the source directory or a previous build in-source occured. This isn't allowed, you have to clean CMakeCache.txt file from your source directory (${srcdir}), and build from a separate directory. ****\n")
+	endif()
+ENDMACRO(prevent_in_source_build)
+
+MACRO(PARSE_ARGUMENTS prefix arg_names option_names)
+	SET(DEFAULT_ARGS)
+	FOREACH(arg_name ${arg_names})
+	SET(${prefix}_${arg_name})
+	ENDFOREACH(arg_name)
+	FOREACH(option ${option_names})
+	SET(${prefix}_${option} FALSE)
+	ENDFOREACH(option)
+
+	SET(current_arg_name DEFAULT_ARGS)
+	SET(current_arg_list)
+	FOREACH(arg ${ARGN})
+	LIST_CONTAINS(is_arg_name ${arg} ${arg_names})
+	IF (is_arg_name)
+		SET(${prefix}_${current_arg_name} ${current_arg_list})
+		SET(current_arg_name ${arg})
+		SET(current_arg_list)
+	ELSE (is_arg_name)
+		LIST_CONTAINS(is_option ${arg} ${option_names})
+		IF (is_option)
+	SET(${prefix}_${arg} TRUE)
+		ELSE (is_option)
+	SET(current_arg_list ${current_arg_list} ${arg})
+		ENDIF (is_option)
+	ENDIF (is_arg_name)
+	ENDFOREACH(arg)
+	SET(${prefix}_${current_arg_name} ${current_arg_list})
+ENDMACRO(PARSE_ARGUMENTS)
+
+MACRO(LIST_CONTAINS var value)
+SET(${var})
+FOREACH (value2 ${ARGN})
+  IF (${value} STREQUAL ${value2})
+	SET(${var} TRUE)
+  ENDIF (${value} STREQUAL ${value2})
+ENDFOREACH (value2)
+ENDMACRO(LIST_CONTAINS)
+
+MACRO(LIST_FILTER)
+PARSE_ARGUMENTS(LIST_FILTER "OUTPUT_VARIABLE" "" ${ARGV})
+# Check arguments.
+LIST(LENGTH LIST_FILTER_DEFAULT_ARGS LIST_FILTER_default_length)
+IF(${LIST_FILTER_default_length} EQUAL 0)
+  MESSAGE(FATAL_ERROR "LIST_FILTER: missing list variable.")
+ENDIF(${LIST_FILTER_default_length} EQUAL 0)
+IF(${LIST_FILTER_default_length} EQUAL 1)
+  MESSAGE(FATAL_ERROR "LIST_FILTER: missing regular expression variable.")
+ENDIF(${LIST_FILTER_default_length} EQUAL 1)
+# Reset output variable
+IF(NOT LIST_FILTER_OUTPUT_VARIABLE)
+  SET(LIST_FILTER_OUTPUT_VARIABLE "LIST_FILTER_internal_output")
+ENDIF(NOT LIST_FILTER_OUTPUT_VARIABLE)
+SET(${LIST_FILTER_OUTPUT_VARIABLE})
+# Extract input list from arguments
+LIST(GET LIST_FILTER_DEFAULT_ARGS 0 LIST_FILTER_input_list)
+LIST(REMOVE_AT LIST_FILTER_DEFAULT_ARGS 0)
+FOREACH(LIST_FILTER_item ${${LIST_FILTER_input_list}})
+  FOREACH(LIST_FILTER_regexp_var ${LIST_FILTER_DEFAULT_ARGS})
+	FOREACH(LIST_FILTER_regexp ${${LIST_FILTER_regexp_var}})
+	  IF(${LIST_FILTER_item} MATCHES ${LIST_FILTER_regexp})
+		LIST(APPEND ${LIST_FILTER_OUTPUT_VARIABLE} ${LIST_FILTER_item})
+	  ENDIF(${LIST_FILTER_item} MATCHES ${LIST_FILTER_regexp})
+	ENDFOREACH(LIST_FILTER_regexp ${${LIST_FILTER_regexp_var}})
+  ENDFOREACH(LIST_FILTER_regexp_var)
+ENDFOREACH(LIST_FILTER_item)
+# If OUTPUT_VARIABLE is not specified, overwrite the input list.
+IF(${LIST_FILTER_OUTPUT_VARIABLE} STREQUAL "LIST_FILTER_internal_output")
+  SET(${LIST_FILTER_input_list} ${${LIST_FILTER_OUTPUT_VARIABLE}})
+ENDIF(${LIST_FILTER_OUTPUT_VARIABLE} STREQUAL "LIST_FILTER_internal_output")
+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})
@@ -50,21 +145,92 @@ endmacro(configure_files_in_dir)
 
 # Create custom target dedicated for HTML5 and DATA AGL target type
 macro(add_input_files INPUT_FILES)
-	add_custom_target(${TARGET_NAME} 
+	if(NOT DEFINED XML_FILES)
+		set(ext_reg "xml$")
+		set(XML_LIST ${INPUT_FILES})
+		list_filter(XML_LIST ext_reg)
+		execute_process(
+			COMMAND which ${XML_CHECKER}
+			RESULT_VARIABLE XML_CHECKER_PRESENT
+			OUTPUT_QUIET ERROR_QUIET
+		)
+	endif()
+	if(NOT DEFINED LUA_LIST)
+		set(ext_reg "lua$")
+		set(LUA_LIST ${INPUT_FILES})
+		list_filter(LUA_LIST ext_reg)
+		execute_process(
+			COMMAND which ${LUA_CHECKER}
+			RESULT_VARIABLE LUA_CHECKER_PRESENT
+			OUTPUT_QUIET ERROR_QUIET
+		)
+	endif()
+	if(NOT DEFINED JSON_FILES)
+		set(ext_reg "json$")
+		set(JSON_LIST ${INPUT_FILES})
+		list_filter(JSON_LIST ext_reg)
+		execute_process(
+			COMMAND which ${JSON_CHECKER}
+			RESULT_VARIABLE JSON_CHECKER_PRESENT
+			OUTPUT_QUIET ERROR_QUIET
+		)
+	endif()
+
+	# These are v3.6 subcommand. Not used as default for now as
+	# many dev use Ubuntu 16.04 which have only 3.5 version
+	#list(FILTER XML_LIST INCLUDE REGEX "xml$")
+	#list(FILTER LUA_LIST INCLUDE REGEX "lua$")
+	#list(FILTER JSON_LIST INCLUDE REGEX "json$")
+
+	add_custom_target(${TARGET_NAME} ALL
 	DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${TARGET_NAME}
 	)
 
+	if(XML_CHECKER_PRESENT EQUAL 0)
+		foreach(file ${XML_LIST})
+			add_custom_command(TARGET ${TARGET_NAME}
+				PRE_BUILD
+				WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+				COMMAND ${XML_CHECKER} ${file}
+			)
+		endforeach()
+	elseif(XML_LIST)
 	add_custom_command(TARGET ${TARGET_NAME}
 	PRE_BUILD
 	WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-	COMMAND [ -f *xml ] && ${XML_CHECKER} ${INPUT_FILES}
-	COMMAND [ -f *lua ] && ${LUA_CHECKER} ${INPUT_FILES}
-	COMMAND [ -f *json ] && for f in ${INPUT_FILES}; do cat ${INPUT_FILES} | ${JSON_CHECKER}; done
-	)
+	COMMAND ${CMAKE_COMMAND} -E cmake_echo_color --red "Warning: XML_CHECKER not found. Not verification made on files !")
+	endif()
+	if(LUA_CHECKER_PRESENT EQUAL 0)
+		foreach(file ${LUA_LIST})
+		add_custom_command(TARGET ${TARGET_NAME}
+			PRE_BUILD
+			WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+			COMMAND ${LUA_CHECKER} ${file}
+		)
+		endforeach()
+	elseif(LUA_LIST)
+		add_custom_command(TARGET ${TARGET_NAME}
+			PRE_BUILD
+			WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+			COMMAND ${CMAKE_COMMAND} -E cmake_echo_color --red "Warning: LUA_CHECKER not found. Not verification made on files !")
+	endif()
+	if(JSON_CHECKER_PRESENT EQUAL 0)
+		foreach(file ${JSON_LIST})
+		add_custom_command(TARGET ${TARGET_NAME}
+			PRE_BUILD
+			WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+			COMMAND ${JSON_CHECKER} ${file}
+		)
+		endforeach()
+	elseif(JSON_LIST)
+	add_custom_command(TARGET ${TARGET_NAME}
+	PRE_BUILD
+	WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+	COMMAND ${CMAKE_COMMAND} -E cmake_echo_color --red "Warning: JSON_CHECKER not found. Not verification made on files !")
+	endif()
 
 	add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${TARGET_NAME}
-	DEPENDS  ${INPUT_FILES}
-	OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${TARGET_NAME}
+	DEPENDS ${INPUT_FILES}
 	COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/${TARGET_NAME}
 	COMMAND touch ${CMAKE_CURRENT_BINARY_DIR}/${TARGET_NAME}
 	COMMAND cp -r ${INPUT_FILES} ${CMAKE_CURRENT_BINARY_DIR}/${TARGET_NAME}
@@ -76,105 +242,178 @@ macro(set_openapi_filename openapi_filename)
 	set(OPENAPI_DEF ${openapi_filename} CACHE STRING "OpenAPI JSON file name used to generate binding header file before building a binding v2 target.")
 endmacro()
 
+# Common command to call inside project_targets_populate macro
+macro(generate_one_populate_target OUTPUTFILES PKG_DESTDIR)
+	add_custom_command(OUTPUT ${PKG_DESTDIR}/${OUTPUTFILES}
+		DEPENDS ${BD}/${OUTPUTFILES}
+		COMMAND mkdir -p ${PKG_DESTDIR}
+		COMMAND touch ${PKG_DESTDIR}
+		COMMAND cp -r ${BD}/${OUTPUTFILES}/* ${PKG_DESTDIR} 2> /dev/null || cp ${BD}/${OUTPUTFILES} ${PKG_DESTDIR}
+	)
+
+	add_custom_target(${POPULE_PACKAGE_TARGET} DEPENDS ${PKG_DESTDIR}/${OUTPUTFILES})
+	add_dependencies(populate ${POPULE_PACKAGE_TARGET})
+	add_dependencies(${POPULE_PACKAGE_TARGET} ${TARGET})
+endmacro()
+
+# To be call inside project_targets_populate macro
+macro(afb_genskel)
+	set (ARGSLIST ${ARGN})
+
+	if ("${PROJECT_LANGUAGES}" MATCHES "CXX")
+		list(APPEND ARGSLIST "--cpp")
+	endif()
+
+	if (OPENAPI_DEF)
+		add_custom_command(OUTPUT ${SD}/${OPENAPI_DEF}.h
+			DEPENDS ${SD}/${OPENAPI_DEF}.json
+			COMMAND afb-genskel ${ARGSLIST} ${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")
+		add_dependencies(${TARGET} "${TARGET}_GENSKEL")
+	else()
+		add_custom_command(OUTPUT ${SD}/${OUT}-apidef.h
+			DEPENDS ${SD}/${OUT}-apidef.json
+			COMMAND afb-genskel ${ARGSLIST} ${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")
+		add_dependencies(${TARGET} "${TARGET}_GENSKEL")
+	endif()
+endmacro()
+
 # Pre-packaging
 macro(project_targets_populate)
 	# Default Widget default directory
-	set(PACKAGE_BINDIR  ${PROJECT_PKG_BUILD_DIR}/bin)
-	set(PACKAGE_ETCDIR  ${PROJECT_PKG_BUILD_DIR}/etc)
-	set(PACKAGE_LIBDIR  ${PROJECT_PKG_BUILD_DIR}/lib)
-	set(PACKAGE_HTTPDIR ${PROJECT_PKG_BUILD_DIR}/htdocs)
-	set(PACKAGE_DATADIR ${PROJECT_PKG_BUILD_DIR}/data)
-
-	add_custom_command(OUTPUT ${PACKAGE_BINDIR} ${PACKAGE_ETCDIR} ${PACKAGE_LIBDIR} ${PACKAGE_HTTPDIR} ${PACKAGE_DATADIR}
-		COMMAND mkdir -p ${PACKAGE_BINDIR} ${PACKAGE_ETCDIR} ${PACKAGE_LIBDIR} ${PACKAGE_HTTPDIR} ${PACKAGE_DATADIR})
-	add_custom_target(populate DEPENDS ${PACKAGE_BINDIR} ${PACKAGE_ETCDIR} ${PACKAGE_LIBDIR} ${PACKAGE_HTTPDIR} ${PACKAGE_DATADIR})
-		get_property(PROJECT_TARGETS GLOBAL PROPERTY PROJECT_TARGETS)
+	set(PACKAGE_BINDIR  ${PROJECT_PKG_BUILD_DIR}/${BINDIR})
+	set(PACKAGE_ETCDIR  ${PROJECT_PKG_BUILD_DIR}/${ETCDIR})
+	set(PACKAGE_LIBDIR  ${PROJECT_PKG_BUILD_DIR}/${LIBDIR})
+	set(PACKAGE_HTTPDIR ${PROJECT_PKG_BUILD_DIR}/${HTTPDIR})
+	set(PACKAGE_DATADIR ${PROJECT_PKG_BUILD_DIR}/${DATADIR})
+	# Default test Widget default directory
+	string(REGEX REPLACE "/([^/]*)$" "/\\1-test" PROJECT_PKG_TEST_DIR "${PROJECT_PKG_BUILD_DIR}")
+	set(PACKAGE_TEST_BINDIR  ${PROJECT_PKG_TEST_DIR}/${BINDIR})
+	set(PACKAGE_TEST_ETCDIR  ${PROJECT_PKG_TEST_DIR}/${ETCDIR})
+	set(PACKAGE_TEST_LIBDIR  ${PROJECT_PKG_TEST_DIR}/${LIBDIR})
+	set(PACKAGE_TEST_HTTPDIR ${PROJECT_PKG_TEST_DIR}/${HTTPDIR})
+	set(PACKAGE_TEST_DATADIR ${PROJECT_PKG_TEST_DIR}/${DATADIR})
+
+	if(${CMAKE_BUILD_TYPE} STREQUAL "TEST")
+		add_custom_command(OUTPUT ${PACKAGE_BINDIR} ${PACKAGE_ETCDIR} ${PACKAGE_LIBDIR} ${PACKAGE_HTTPDIR} ${PACKAGE_DATADIR} ${PACKAGE_TEST_BINDIR} ${PACKAGE_TEST_ETCDIR} ${PACKAGE_TEST_LIBDIR} ${PACKAGE_TEST_HTTPDIR} ${PACKAGE_TEST_DATADIR}
+			COMMAND mkdir -p ${PACKAGE_BINDIR} ${PACKAGE_ETCDIR} ${PACKAGE_LIBDIR} ${PACKAGE_HTTPDIR} ${PACKAGE_DATADIR}
+			COMMAND mkdir -p ${PACKAGE_TEST_BINDIR} ${PACKAGE_TEST_ETCDIR} ${PACKAGE_TEST_LIBDIR} ${PACKAGE_TEST_HTTPDIR} ${PACKAGE_TEST_DATADIR})
+		add_custom_target(populate DEPENDS ${PACKAGE_BINDIR} ${PACKAGE_ETCDIR} ${PACKAGE_LIBDIR} ${PACKAGE_HTTPDIR} ${PACKAGE_DATADIR} ${PACKAGE_TEST_BINDIR} ${PACKAGE_TEST_ETCDIR} ${PACKAGE_TEST_LIBDIR} ${PACKAGE_TEST_HTTPDIR} ${PACKAGE_TEST_DATADIR})
+	else()
+		add_custom_command(OUTPUT ${PACKAGE_BINDIR} ${PACKAGE_ETCDIR} ${PACKAGE_LIBDIR} ${PACKAGE_HTTPDIR} ${PACKAGE_DATADIR}
+			COMMAND mkdir -p ${PACKAGE_BINDIR} ${PACKAGE_ETCDIR} ${PACKAGE_LIBDIR} ${PACKAGE_HTTPDIR} ${PACKAGE_DATADIR})
+		add_custom_target(populate DEPENDS ${PACKAGE_BINDIR} ${PACKAGE_ETCDIR} ${PACKAGE_LIBDIR} ${PACKAGE_HTTPDIR} ${PACKAGE_DATADIR})
+	endif()
+
+	# Dirty trick to define a default INSTALL command for app-templates handled
+	# targets
+	INSTALL(CODE "execute_process(COMMAND make populate)")
+	if(NO_DEDICATED_INSTALL_DIR)
+		INSTALL(DIRECTORY ${PROJECT_PKG_BUILD_DIR}/
+			DESTINATION ${CMAKE_INSTALL_PREFIX}
+		)
+	else()
+		INSTALL(DIRECTORY ${PROJECT_PKG_BUILD_DIR}/
+			DESTINATION ${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}
+		)
+	endif()
+
+	get_property(PROJECT_TARGETS GLOBAL PROPERTY PROJECT_TARGETS)
 	foreach(TARGET ${PROJECT_TARGETS})
+		# Declaration of a custom command that will populate widget tree with the target
+		set(POPULE_PACKAGE_TARGET "project_populate_${TARGET}")
 		get_target_property(T ${TARGET} LABELS)
-		if(T)
-			# Declaration of a custom command that will populate widget tree with the target
-			set(POPULE_PACKAGE_TARGET "project_populate_${TARGET}")
 
+		if(T)
 			get_target_property(P ${TARGET} PREFIX)
+			get_target_property(S ${TARGET} SUFFIX)
 			get_target_property(BD ${TARGET} BINARY_DIR)
 			get_target_property(SD ${TARGET} SOURCE_DIR)
 			get_target_property(OUT ${TARGET} OUTPUT_NAME)
 
 			if(P MATCHES "NOTFOUND$")
-				if (${T} STREQUAL "BINDING")
+				if (${T} STREQUAL "LIBRARY")
 					set(P "lib")
 				else()
 					set(P "")
 				endif()
 			endif()
 
-			if(${T} STREQUAL "BINDING")
-				list(APPEND BINDINGS_LIST "${P}${OUT}")
-				add_custom_command(OUTPUT ${PACKAGE_LIBDIR}/${P}${OUT}.so
-					DEPENDS ${BD}/${P}${OUT}.so
-					COMMAND mkdir -p ${PACKAGE_LIBDIR}
-					COMMAND cp ${BD}/${P}${OUT}.so ${PACKAGE_LIBDIR}
-				)
-				add_custom_target(${POPULE_PACKAGE_TARGET} DEPENDS ${PACKAGE_LIBDIR}/${P}${OUT}.so)
-				add_dependencies(populate ${POPULE_PACKAGE_TARGET})
-				add_dependencies(${POPULE_PACKAGE_TARGET} ${TARGET})
+			get_target_property(IMPPATH ${TARGET} IMPORTED_LOCATION)
+			if(${T} STREQUAL "LIBRARY")
+				unset(BD)
+				generate_one_populate_target(${IMPPATH} ${PACKAGE_LIBDIR})
+			elseif(${T} STREQUAL "TEST-LIBRARY")
+				unset(BD)
+				generate_one_populate_target(${IMPPATH} ${PACKAGE_TEST_LIBDIR})
+			elseif(${T} STREQUAL "PLUGIN")
+				if(NOT S)
+					set(S ".ctlso")
+				endif()
+				generate_one_populate_target(${P}${OUT}${S} "${PACKAGE_LIBDIR}/plugins")
+			elseif(${CMAKE_BUILD_TYPE} STREQUAL "TEST" AND ${T} STREQUAL "TEST-PLUGIN")
+				if(NOT S)
+					set(S ".ctlso")
+				endif()
+				generate_one_populate_target(${P}${OUT}${S} "${PACKAGE_TEST_LIBDIR}/plugins")
+			elseif(${T} STREQUAL "BINDING")
+				if(NOT S)
+					set(S ".so")
+				endif()
+				list(APPEND BINDINGS_LIST "${P}${OUT}${S}")
+				generate_one_populate_target(${P}${OUT}${S} ${PACKAGE_LIBDIR})
 			elseif(${T} STREQUAL "BINDINGV2")
-				add_custom_command(OUTPUT ${PACKAGE_LIBDIR}/${P}${OUT}.so
-					DEPENDS ${BD}/${P}${OUT}.so
-					COMMAND mkdir -p ${PACKAGE_LIBDIR}
-					COMMAND cp ${BD}/${P}${OUT}.so ${PACKAGE_LIBDIR}
-				)
-				add_custom_target(${POPULE_PACKAGE_TARGET} DEPENDS ${PACKAGE_LIBDIR}/${P}${OUT}.so)
-
-				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
-					)
-					add_custom_target("${TARGET}_GENSKEL" DEPENDS ${SD}/${OPENAPI_DEF}.h
-						COMMENT "Generating OpenAPI header file ${OPENAPI_DEF}.h")
-					add_dependencies(${TARGET} "${TARGET}_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
-					)
-					add_custom_target("${TARGET}_GENSKEL" DEPENDS ${SD}/${OUT}-apidef.h
-						COMMENT "Generating OpenAPI header file ${OUT}-apidef.h")
-					add_dependencies(${TARGET} "${TARGET}_GENSKEL")
+				if(NOT S)
+					set(S ".so")
 				endif()
+				afb_genskel("-2")
+				generate_one_populate_target(${P}${OUT}${S} ${PACKAGE_LIBDIR})
+			elseif(${T} STREQUAL "BINDINGV3")
+				if(NOT S)
+					set(S ".so")
+				endif()
+				afb_genskel("-3")
+				generate_one_populate_target(${P}${OUT}${S} ${PACKAGE_LIBDIR})
 			elseif(${T} STREQUAL "EXECUTABLE")
-				add_custom_command(OUTPUT ${PACKAGE_BINDIR}/${P}${OUT}
-					DEPENDS ${BD}/${P}${OUT}
-					COMMAND mkdir -p ${PACKAGE_BINDIR}
-					COMMAND cp ${BD}/${P}${OUT} ${PACKAGE_BINDIR}
-				)
-				add_custom_target(${POPULE_PACKAGE_TARGET} DEPENDS ${PACKAGE_BINDIR}/${P}${OUT})
-				add_dependencies(populate ${POPULE_PACKAGE_TARGET})
-				add_dependencies(${POPULE_PACKAGE_TARGET} ${TARGET})
+				if(NOT S)
+					set(S "")
+				endif()
+				if(NOT OUT AND IMPPATH)
+					unset(BD)
+					generate_one_populate_target(${IMPPATH} ${PACKAGE_BINDIR})
+				else()
+					generate_one_populate_target(${P}${OUT}${S} ${PACKAGE_BINDIR})
+				endif()
+			elseif(${CMAKE_BUILD_TYPE} STREQUAL "TEST" AND ${T} STREQUAL "TEST-EXECUTABLE")
+				if(NOT S)
+					set(S "")
+				endif()
+				if(NOT OUT AND IMPPATH)
+					unset(BD)
+					generate_one_populate_target(${IMPPATH} ${PACKAGE_TEST_BINDIR})
+				else()
+					generate_one_populate_target(${P}${OUT}${S} ${PACKAGE_TEST_BINDIR})
+				endif()
 			elseif(${T} STREQUAL "HTDOCS")
-				add_custom_command(OUTPUT ${PACKAGE_HTTPDIR}-xx
-					DEPENDS ${BD}/${P}${OUT}
-					COMMAND mkdir -p ${PACKAGE_HTTPDIR}
-					COMMAND touch ${PACKAGE_HTTPDIR}
-					COMMAND cp -r ${BD}/${P}${OUT}/* ${PACKAGE_HTTPDIR}
-				)
-				add_custom_target(${POPULE_PACKAGE_TARGET} DEPENDS ${PACKAGE_HTTPDIR}-xx)
-				add_dependencies(populate ${POPULE_PACKAGE_TARGET})
-				add_dependencies(${POPULE_PACKAGE_TARGET} ${TARGET})
-			elseif(${T} STREQUAL "DATA")
-				add_custom_command(OUTPUT ${PACKAGE_DATADIR}-xx
-					DEPENDS ${BD}/${P}${OUT}
-					COMMAND mkdir -p ${PACKAGE_DATADIR}
-					COMMAND touch ${PACKAGE_DATADIR}
-					COMMAND cp -r ${BD}/${P}${OUT}/* ${PACKAGE_DATADIR}
-				)
-				add_custom_target(${POPULE_PACKAGE_TARGET} DEPENDS ${PACKAGE_DATADIR}-xx)
-				add_dependencies(populate ${POPULE_PACKAGE_TARGET})
-				add_dependencies(${POPULE_PACKAGE_TARGET} ${TARGET})
-			endif(${T} STREQUAL "BINDING")
-		elseif(${CMAKE_BUILD_TYPE} MATCHES "[Dd][Ee][Bb][Uu][Gg]")
-			MESSAGE("${Yellow}.. Warning: ${TARGET} ignored when packaging.${ColourReset}")
+				generate_one_populate_target(${P}${OUT} ${PACKAGE_HTTPDIR})
+			elseif(${CMAKE_BUILD_TYPE} STREQUAL "TEST" AND ${T} STREQUAL "TEST-HTDOCS")
+				generate_one_populate_target(${P}${OUT} ${PACKAGE_HTTPDIR})
+			elseif(${T} STREQUAL "DATA" )
+				generate_one_populate_target(${TARGET} ${PACKAGE_DATADIR})
+			elseif(${CMAKE_BUILD_TYPE} STREQUAL "TEST" AND ${T} STREQUAL "TEST-DATA")
+				generate_one_populate_target(${TARGET} ${PACKAGE_TEST_DATADIR})
+			elseif(${T} STREQUAL "BINDING-CONFIG" )
+				generate_one_populate_target(${TARGET} ${PACKAGE_ETCDIR})
+			elseif(${CMAKE_BUILD_TYPE} STREQUAL "TEST" AND ${T} STREQUAL "TEST-CONFIG")
+				generate_one_populate_target(${TARGET} ${PACKAGE_TEST_ETCDIR})
+			endif()
+			elseif(${CMAKE_BUILD_TYPE} MATCHES "[Dd][Ee][Bb][Uu][Gg]")
+				MESSAGE("${Yellow}.. Warning: ${TARGET} ignored when packaging.${ColourReset}")
 		endif()
 	endforeach()
 endmacro(project_targets_populate)
@@ -219,8 +458,13 @@ macro(remote_targets_populate)
 		add_custom_target(remote-target-populate
 			COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/target/*.sh
 			COMMAND rsync -e "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" --archive --delete ${PROJECT_PKG_BUILD_DIR}/ ${RSYNC_TARGET}:${RSYNC_PREFIX}/${PROJECT_NAME}
-			COMMENT "${REMOTE_LAUNCH}"
 		)
+
+		add_custom_command(TARGET remote-target-populate
+		POST_BUILD
+		COMMAND ${CMAKE_COMMAND} -E cmake_echo_color --green --bold ${REMOTE_LAUNCH}
+		)
+
 		add_dependencies(remote-target-populate populate)
 	endif()
 endmacro(remote_targets_populate)
@@ -234,16 +478,20 @@ macro(wgt_package_build)
 	endif()
 	if(NOT DEFINED PROJECT_ICON)
 		if( ${WIDGET_TYPE} MATCHES "agl.native")
-			set(PROJECT_ICON ${PKG_APP_TEMPLATE_DIR}/wgt/icon-native.png)
+			set(ICON_PATH ${PKG_APP_TEMPLATE_DIR}/wgt/icon-native.png)
 		elseif( ${WIDGET_TYPE} MATCHES "agl.service")
-			set(PROJECT_ICON ${PKG_APP_TEMPLATE_DIR}/wgt/icon-service.png)
+			set(ICON_PATH ${PKG_APP_TEMPLATE_DIR}/wgt/icon-service.png)
 		elseif( ${WIDGET_TYPE} MATCHES "x-executable")
-			set(PROJECT_ICON ${PKG_APP_TEMPLATE_DIR}/wgt/icon-qml.png)
+			set(ICON_PATH ${PKG_APP_TEMPLATE_DIR}/wgt/icon-qml.png)
 		elseif( ${WIDGET_TYPE} MATCHES "text/html")
-			set(PROJECT_ICON ${PKG_APP_TEMPLATE_DIR}/wgt/icon-html5.png)
-		else()
-			set(PROJECT_ICON ${PKG_APP_TEMPLATE_DIR}/wgt/icon-default.png)
+			set(ICON_PATH ${PKG_APP_TEMPLATE_DIR}/wgt/icon-html5.png)
 		endif()
+	elseif(EXISTS "${CMAKE_SOURCE_DIR}/${WIDGET_ICON}")
+		set(ICON_PATH "${CMAKE_SOURCE_DIR}/${WIDGET_ICON}")
+	elseif(EXISTS "${WIDGET_ICON}")
+		set(ICON_PATH "${WIDGET_ICON}")
+	else()
+		set(ICON_PATH ${CMAKE_SOURCE_DIR}/${PROJECT_APP_TEMPLATES_DIR}/wgt/icon-default.png)
 	endif()
 
 	if(NOT WIDGET_ENTRY_POINT)
@@ -252,10 +500,21 @@ macro(wgt_package_build)
 
 	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 ${TEMPLATE_DIR}/icon-default.png ${PROJECT_PKG_BUILD_DIR}/${PROJECT_ICON}
-
+		COMMAND cp ${ICON_PATH} ${PROJECT_PKG_BUILD_DIR}/${PROJECT_ICON}
+	)
+	add_custom_command(OUTPUT ${PROJECT_PKG_TEST_DIR}/test-config.xml ${PROJECT_PKG_TEST_DIR}/bin/launcher
+		COMMAND ${CMAKE_COMMAND} -DINFILE=${CMAKE_SOURCE_DIR}/${PROJECT_APP_TEMPLATES_DIR}/test-widget/test-config.xml.in -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 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
 	)
-	add_custom_target(packaging_wgt DEPENDS ${PROJECT_PKG_BUILD_DIR}/config.xml)
+
+	if(${CMAKE_BUILD_TYPE} STREQUAL "TEST")
+		string(TOLOWER "${PROJECT_NAME}-${CMAKE_BUILD_TYPE}" WGT_NAME)
+		add_custom_target(packaging_wgt DEPENDS ${PROJECT_PKG_BUILD_DIR}/config.xml ${PROJECT_PKG_TEST_DIR}/test-config.xml ${PROJECT_PKG_TEST_DIR}/bin/launcher)
+	else()
+		string(TOLOWER "${PROJECT_NAME}" WGT_NAME)
+		add_custom_target(packaging_wgt DEPENDS ${PROJECT_PKG_BUILD_DIR}/config.xml)
+	endif()
 
 	# Fulup ??? copy any extra file in wgt/etc into populate package before building the widget
 	file(GLOB PROJECT_CONF_FILES "${TEMPLATE_DIR}/etc/*")
@@ -263,14 +522,39 @@ 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})
+		set(packCMDTest ${wgtpkgCMD} "-f" "-o" "${WGT_NAME}-test.wgt" ${PROJECT_PKG_TEST_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" "*")
+			set(packCMDTest ${CMAKE_COMMAND} -E cmake_echo_color --yellow "Warning: Test widget will be built using Zip, NOT using the Application Framework widget pack command." && cd ${PROJECT_PKG_TEST_DIR} && ${wgtpkgCMD} "../${WGT_NAME}-test.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_command(OUTPUT ${WGT_NAME}-test.wgt
+		DEPENDS ${PROJECT_TARGETS}
+		COMMAND ${packCMDTest}
+	)
+
+	if(${CMAKE_BUILD_TYPE} STREQUAL "TEST")
+		add_custom_target(widget DEPENDS ${WGT_NAME}.wgt ${WGT_NAME}-test.wgt)
+		set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES "${CMAKE_CURRENT_BINARY_DIR}/${WGT_NAME}-test.wgt")
+	else()
+		add_custom_target(widget DEPENDS ${WGT_NAME}.wgt)
+	endif()
+
 	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}")
@@ -279,13 +563,13 @@ macro(wgt_package_build)
 			COMMAND exit -1
 		)
 	else()
-	configure_files_in_dir(${TEMPLATE_DIR})
-	add_custom_target(widget-target-install
-	DEPENDS widget
-	COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/target/install-wgt-on-${RSYNC_TARGET}.sh
-	COMMAND ${CMAKE_CURRENT_BINARY_DIR}/target/install-wgt-on-${RSYNC_TARGET}.sh
-	)
-endif()
+		configure_files_in_dir(${TEMPLATE_DIR})
+		add_custom_target(widget-target-install
+			DEPENDS widget
+			COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/target/install-wgt-on-${RSYNC_TARGET}.sh
+			COMMAND ${CMAKE_CURRENT_BINARY_DIR}/target/install-wgt-on-${RSYNC_TARGET}.sh
+		)
+	endif()
 
 	if(PACKAGE_MESSAGE)
 	add_custom_command(TARGET widget
@@ -312,22 +596,10 @@ macro(rpm_package_build)
 	endif()
 endmacro(rpm_package_build)
 
-macro(deb_package_build)
-#TODO
-endmacro(deb_package_build)
-
 macro(project_package_build)
-	if(EXISTS ${TEMPLATE_DIR})
-		rpm_package_build()
-	endif()
-
 	if(EXISTS ${TEMPLATE_DIR})
 		wgt_package_build()
 	endif()
-
-	if(EXISTS ${TEMPLATE_DIR})
-		deb_package_build()
-	endif()
 endmacro(project_package_build)
 
 macro(project_subdirs_add)
@@ -342,6 +614,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)
@@ -355,7 +629,27 @@ macro(project_closing_msg)
 		add_custom_target(${PROJECT_NAME}_build_done ALL
 			COMMAND ${CMAKE_COMMAND} -E cmake_echo_color --cyan "++ ${CLOSING_MESSAGE}"
 		)
-		 add_dependencies(${PROJECT_NAME}_build_done
-		 	${DEPENDENCIES_TARGET} ${PROJECT_TARGETS})
+		add_dependencies(${PROJECT_NAME}_build_done
+			${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()