X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=templates%2Fservice%2Fetc%2Fmacros.cmake;h=18af27eba024ae4da911cb080987b66673c30bcc;hb=6993026755563379e964966ee7fc73923a21828d;hp=9d34aa7eccc8c7fb07153a2046deb21488fd0bf0;hpb=9ea81dbd25d509cbe88de0702bed54020180f979;p=apps%2Fapp-templates.git

diff --git a/templates/service/etc/macros.cmake b/templates/service/etc/macros.cmake
index 9d34aa7..18af27e 100644
--- a/templates/service/etc/macros.cmake
+++ b/templates/service/etc/macros.cmake
@@ -28,16 +28,8 @@
 # Generic useful macro
 # -----------------------
 macro(PROJECT_TARGET_ADD TARGET_NAME)
-	set(PROJECT_TARGETS ${PROJECT_TARGETS} ${TARGET_NAME} CACHE INTERNAL PROJECT_TARGETS)
+	set_property(GLOBAL APPEND PROPERTY PROJECT_TARGETS ${TARGET_NAME})
 	set(TARGET_NAME ${TARGET_NAME})
-
-	# Cmake does not maintain targets list before 3.7
-	# -------------------------------------------------
-	if(${CMAKE_VERSION} VERSION_LESS 3.7)
-		set(GLOBAL_TARGET_LIST ${PROJECT_TARGETS} CACHE INTERNAL "Hold project targets")
-	else()
-		get_property(GLOBAL_TARGET_LIST GLOBAL PROPERTY GlobalTargetList)
-	endif()
 endmacro(PROJECT_TARGET_ADD)
 
 # Check GCC minimal version version
@@ -55,6 +47,7 @@ endmacro(defstr)
 # WGT packaging
 macro(project_targets_populate)
 	add_custom_target(MAIN_POPULATE)
+	get_property(PROJECT_TARGETS GLOBAL PROPERTY PROJECT_TARGETS)
 	foreach(TARGET ${PROJECT_TARGETS})
 		get_target_property(T ${TARGET} LABELS)
 		if(T)
@@ -129,7 +122,7 @@ macro(project_package_build)
 			DEPENDS ${PROJECT_TARGETS}
 			COMMAND wgtpkg-pack -f -o ${PROJECT_NAME}.wgt ${WIDGET_DIR}
 		)
-		
+
 		add_custom_target(widget DEPENDS ${PROJECT_NAME}.wgt)
 		add_dependencies(widget MAIN_POPULATE)
 		set(ADDITIONAL_MAKE_CLEAN_FILES, "${PROJECT_NAME}.wgt")
@@ -258,11 +251,13 @@ endif()
 # Print developer helper message when build is done
 # -------------------------------------------------------
 macro(project_closing_msg)
-	if(CLOSING_MESSAGE AND GLOBAL_TARGET_LIST)
+	get_property(PROJECT_TARGETS_SET GLOBAL PROPERTY PROJECT_TARGETS SET)
+	get_property(PROJECT_TARGETS GLOBAL PROPERTY PROJECT_TARGETS)
+	if(CLOSING_MESSAGE AND ${PROJECT_TARGETS_SET})
 		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} ${GLOBAL_TARGET_LIST})
+		 	${DEPENDENCIES_TARGET} ${PROJECT_TARGETS})
 	endif()
 endmacro()