X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=reference%2Fetc%2Fmacros.cmake;h=5a85b86c90fc13ed7983fcb08a13e398fbd059f7;hb=ce3f41af229012f093f5301294f828b52fdbed70;hp=a002d9582c72e43e6b84839c4246219e1e68219e;hpb=453eaf61f02b19b7fa5ac3f71243ca9d5ee63317;p=apps%2Fapp-templates.git

diff --git a/reference/etc/macros.cmake b/reference/etc/macros.cmake
index a002d95..5a85b86 100644
--- a/reference/etc/macros.cmake
+++ b/reference/etc/macros.cmake
@@ -30,6 +30,14 @@
 macro(PROJECT_TARGET_ADD TARGET_NAME)
 	set(PROJECT_TARGETS ${PROJECT_TARGETS} ${TARGET_NAME} CACHE INTERNAL PROJECT_TARGETS)
 	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})
+	else()
+		get_property(GLOBAL_TARGET_LIST GLOBAL PROPERTY GlobalTargetList)
+	endif()
 endmacro(PROJECT_TARGET_ADD)
 
 macro(defstr name value)
@@ -47,12 +55,6 @@ macro(project_targets_populate)
 		get_target_property(BD ${TARGET} BINARY_DIR)
 		get_target_property(OUT ${TARGET} OUTPUT_NAME)
 
-		if(${P} STREQUAL "P-NOTFOUND" AND ${T} STREQUAL "BINDING")
-			set(P "lib")
-		elseif(${P} STREQUAL "P-NOTFOUND")
-			set(P "")
-		endif(${P} STREQUAL "P-NOTFOUND" AND ${T} STREQUAL "BINDING")
-
 		if(${T} STREQUAL "BINDING")
 			add_custom_command(OUTPUT ${WIDGET_LIBDIR}/${P}${TARGET}.so
 				DEPENDS ${TARGET}
@@ -71,6 +73,14 @@ macro(project_targets_populate)
 			add_custom_command(OUTPUT ${WIDGET_HTTPDIR}
 				DEPENDS ${TARGET}
 				COMMAND cp -r ${BD}/${P}${OUT} ${WIDGET_HTTPDIR}
+			if(P MATCHES "NOTFOUND$")
+				if (${T} STREQUAL "BINDING")
+					set(P "lib")
+				else()
+					set(P "")
+				endif()
+			endif()
+
 				)
 				add_custom_target(${POPULE_WIDGET_TARGET} ALL DEPENDS ${WIDGET_HTTPDIR})
 		elseif(${T} STREQUAL "DATA")
@@ -131,7 +141,7 @@ set(CMP0048 1)
 
 # Include project configuration
 # ------------------------------
-project(${NAME} VERSION ${VERSION})
+project(${PROJECT_NAME} VERSION ${PROJECT_VERSION} LANGUAGES ${PROJECT_LANGUAGES})
 set(PROJECT_WGT_DIR "packaging/wgt" CACHE PATH "Subpath to the widget directory")
 set(PROJECT_LIBDIR "libs" CACHE PATH "Subpath to libraries")
 set(PROJECT_RESOURCES "data" CACHE PATH "Subpath to data")
@@ -221,24 +231,17 @@ endif()
 if(EXTRA_DEPENDENCIES_ORDER)
 	set(DEPENDENCIES_TARGET ${PROJECT_NAME}_extra_dependencies)
 	add_custom_target(${DEPENDENCIES_TARGET} ALL
-		DEPENDS ${EXTRA_DEPENDENCY_ORDER} 
+		DEPENDS ${EXTRA_DEPENDENCY_ORDER}
 	)
 endif()
 
-# Cmake does not maintain targets list before 3.7
-# -------------------------------------------------
-if(${CMAKE_VERSION} VERSION_LESS 3.7)
-	set(GLOBAL_TARGET_LIST ${PROJECT_TARGETS})
-else()
-	get_property(GLOBAL_TARGET_LIST GLOBAL PROPERTY GlobalTargetList)
-endif()
-
 # Print developer helper message when everything is done
 # -------------------------------------------------------
-if(CLOSING_MESSAGE AND GLOBAL_TARGET_LIST)
-	add_custom_target(${PROJECT_NAME}_done ALL
-		DEPENDS ${DEPENDENCIES_TARGET} ${GLOBAL_TARGET_LIST}
-		COMMAND ${CMAKE_COMMAND} -E cmake_echo_color --cyan "++ ${CLOSING_MESSAGE}"
-	)
-endif()
-
+macro(project_closing_msg)
+	if(CLOSING_MESSAGE AND GLOBAL_TARGET_LIST)
+		add_custom_target(${PROJECT_NAME}_done ALL
+			DEPENDS ${DEPENDENCIES_TARGET} ${GLOBAL_TARGET_LIST}
+			COMMAND ${CMAKE_COMMAND} -E cmake_echo_color --cyan "++ ${CLOSING_MESSAGE}"
+		)
+	endif()
+endmacro()