X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=cmake%2Fcmake.d%2F03-macros.cmake;h=89b93f631c7920f3b67f93d06cbb816f9ed504dd;hb=e9a682f1c694eec242c3cebccc09380f621ade0b;hp=7abbf08ffb2d9e300a93e836bc21018de65766b5;hpb=9c71a765f0e4f53a6bbae5f550515b93eb9d7c53;p=staging%2Fxdg-launcher.git

diff --git a/cmake/cmake.d/03-macros.cmake b/cmake/cmake.d/03-macros.cmake
index 7abbf08..89b93f6 100644
--- a/cmake/cmake.d/03-macros.cmake
+++ b/cmake/cmake.d/03-macros.cmake
@@ -22,6 +22,79 @@
 #     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(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(PROJECT_TARGET_ADD TARGET_NAME)
@@ -50,14 +123,29 @@ endmacro(configure_files_in_dir)
 
 # Create custom target dedicated for HTML5 and DATA AGL target type
 macro(add_input_files INPUT_FILES)
-	set(XML_LIST ${INPUT_FILES})
-	set(LUA_LIST ${INPUT_FILES})
-	set(JSON_LIST ${INPUT_FILES})
-	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} 
+	if(NOT DEFINED XML_FILES)
+		set(ext_reg "xml$")
+		set(XML_LIST ${INPUT_FILES})
+		list_filter(XML_LIST ext_reg)
+	endif()
+	if(NOT DEFINED LUA_LIST)
+		set(ext_reg "lua$")
+		set(LUA_LIST ${INPUT_FILES})
+		list_filter(LUA_LIST ext_reg)
+	endif()
+	if(NOT DEFINED JSON_FILES)
+		set(ext_reg "json$")
+		set(JSON_LIST ${INPUT_FILES})
+		list_filter(JSON_LIST ext_reg)
+	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}
 	)
 
@@ -99,106 +187,135 @@ 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)
+	set(BINDIR bin)
+	set(ETCDIR etc)
+	set(LIBDIR lib)
+	set(HTTPDIR htdocs)
+	set(DATADIR data)
+	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})
 
 	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)
+
+	INSTALL(CODE "execute_process(COMMAND make populate)")
+	INSTALL(DIRECTORY ${PROJECT_PKG_BUILD_DIR}/
+		DESTINATION ${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}
+	)
+
+	get_property(PROJECT_TARGETS GLOBAL PROPERTY PROJECT_TARGETS)
 	foreach(TARGET ${PROJECT_TARGETS})
-		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}")
-
-			get_target_property(P ${TARGET} PREFIX)
-			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")
-					set(P "lib")
-				else()
-					set(P "")
-				endif()
+	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}")
+
+		get_target_property(P ${TARGET} PREFIX)
+		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")
+				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}
+		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})
+		elseif(${T} STREQUAL "BINDINGV2")
+			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(${POPULE_PACKAGE_TARGET} DEPENDS ${PACKAGE_LIBDIR}/${P}${OUT}.so)
-				add_dependencies(populate ${POPULE_PACKAGE_TARGET})
-				add_dependencies(${POPULE_PACKAGE_TARGET} ${TARGET})
-			elseif(${T} STREQUAL "BINDINGV2")
-				add_custom_command(OUTPUT ${PACKAGE_LIBDIR}/${P}${OUT}.so
+				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")
+			endif()
+
+			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")
-				endif()
-			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})
-			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")
-				# Generate list of output files instead of just one output directory
-				get_target_property(SF ${TARGET} SOURCES)
-				foreach(file ${SF})
-					get_filename_component(JUST_FILENAME ${file} NAME)
-					list(APPEND OUTPUT_FILES ${PACKAGE_DATADIR}/${JUST_FILENAME})
-				endforeach()
-				add_custom_target(${POPULE_PACKAGE_TARGET})
-				add_custom_command(TARGET ${POPULE_PACKAGE_TARGET}
-					POST_BUILD
-					COMMAND mkdir -p ${PACKAGE_DATADIR}
-					COMMAND touch ${PACKAGE_DATADIR}
-					COMMAND cp -r ${BD}/${TARGET} ${PACKAGE_DATADIR}
-				)
 				add_dependencies(populate ${POPULE_PACKAGE_TARGET})
 				add_dependencies(${POPULE_PACKAGE_TARGET} ${TARGET})
-			endif(${T} STREQUAL "BINDING")
+		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})
+		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")
+			# Generate list of output files instead of just one output directory
+			get_target_property(SF ${TARGET} SOURCES)
+			foreach(file ${SF})
+				get_filename_component(JUST_FILENAME ${file} NAME)
+				list(APPEND OUTPUT_FILES ${PACKAGE_DATADIR}/${JUST_FILENAME})
+			endforeach()
+			add_custom_target(${POPULE_PACKAGE_TARGET})
+			add_custom_command(TARGET ${POPULE_PACKAGE_TARGET}
+				POST_BUILD
+				COMMAND mkdir -p ${PACKAGE_DATADIR}
+				COMMAND touch ${PACKAGE_DATADIR}
+				COMMAND cp -r ${BD}/${TARGET} ${PACKAGE_DATADIR}
+			)
+			add_dependencies(populate ${POPULE_PACKAGE_TARGET})
+			add_dependencies(${POPULE_PACKAGE_TARGET} ${TARGET})
+			elseif(${T} STREQUAL "BINDING-CONFIG")
+			# Generate list of output files instead of just one output directory
+			get_target_property(SF ${TARGET} SOURCES)
+			foreach(file ${SF})
+				get_filename_component(JUST_FILENAME ${file} NAME)
+				list(APPEND OUTPUT_FILES ${PACKAGE_ETCDIR}/${JUST_FILENAME})
+			endforeach()
+			add_custom_target(${POPULE_PACKAGE_TARGET})
+			add_custom_command(TARGET ${POPULE_PACKAGE_TARGET}
+				POST_BUILD
+				COMMAND mkdir -p ${PACKAGE_ETCDIR}
+				COMMAND touch ${PACKAGE_ETCDIR}
+				COMMAND cp -r ${BD}/${TARGET}/* ${PACKAGE_ETCDIR}
+			)
+			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}")
 		endif()
@@ -245,8 +362,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)
@@ -260,16 +382,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)
@@ -278,7 +404,7 @@ 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_target(packaging_wgt DEPENDS ${PROJECT_PKG_BUILD_DIR}/config.xml)
@@ -343,17 +469,17 @@ macro(deb_package_build)
 endmacro(deb_package_build)
 
 macro(project_package_build)
-	if(EXISTS ${TEMPLATE_DIR})
-		rpm_package_build()
-	endif()
+#	if(EXISTS ${TEMPLATE_DIR})
+#		rpm_package_build()
+#	endif()
 
 	if(EXISTS ${TEMPLATE_DIR})
 		wgt_package_build()
 	endif()
 
-	if(EXISTS ${TEMPLATE_DIR})
-		deb_package_build()
-	endif()
+#	if(EXISTS ${TEMPLATE_DIR})
+#		deb_package_build()
+#	endif()
 endmacro(project_package_build)
 
 macro(project_subdirs_add)
@@ -381,7 +507,7 @@ 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()