X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=cmake%2Fcmake.d%2F02-macros.cmake;h=08a56f023bef229ca7e4ac17fb35228d1d7b5dc2;hb=2320bfb86e2bb1ff263f8dca71e4729ba6a7e152;hp=a04b915630345cbc543827934f6f0be1115e3dce;hpb=b9f1f36e653dd2e5a660421b235d8c5be1c34963;p=apps%2Fapp-templates.git

diff --git a/cmake/cmake.d/02-macros.cmake b/cmake/cmake.d/02-macros.cmake
index a04b915..08a56f0 100644
--- a/cmake/cmake.d/02-macros.cmake
+++ b/cmake/cmake.d/02-macros.cmake
@@ -20,7 +20,7 @@
 #--------------------------------------------------------------------------
 #  WARNING:
 #     Do not change this cmake template
-#     Customise your preferences in "./etc/config.cmake"
+#     Customise your preferences in "./conf.d/cmake/config.cmake"
 #--------------------------------------------------------------------------
 # Generic useful macro
 # -----------------------
@@ -42,7 +42,9 @@ macro(configure_files_in_dir dir)
 	foreach(file ${filelist})
 		get_filename_component(filename ${file} NAME)
 		string(REGEX REPLACE "target" "${RSYNC_TARGET}" destinationfile ${filename})
+		string(REGEX REPLACE ".in$" "" destinationfile ${destinationfile})
 		configure_file(${file} ${CMAKE_CURRENT_BINARY_DIR}/target/${destinationfile})
+		set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES "${CMAKE_CURRENT_BINARY_DIR}/target/${destinationfile}")
 	endforeach()
 endmacro(configure_files_in_dir)
 
@@ -77,39 +79,35 @@ macro(project_targets_populate)
 			endif()
 
 			if(${T} STREQUAL "BINDING")
-				add_custom_command(OUTPUT ${PACKAGE_LIBDIR}/${P}${TARGET}.so
-					DEPENDS ${TARGET}
+				add_custom_command(OUTPUT ${PACKAGE_LIBDIR}/${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}${TARGET}.so)
-				add_dependencies(populate ${POPULE_PACKAGE_TARGET})
+				add_dependencies(populate ${POPULE_PACKAGE_TARGET} ${TARGET})
 			elseif(${T} STREQUAL "EXECUTABLE")
-				add_custom_command(OUTPUT ${PACKAGE_BINDIR}/${P}${TARGET}
-					DEPENDS ${TARGET}
+				add_custom_command(OUTPUT ${PACKAGE_BINDIR}/${P}${OUT}
 					COMMAND mkdir -p ${PACKAGE_BINDIR}
 					COMMAND cp ${BD}/${P}${OUT} ${PACKAGE_BINDIR}
 				)
 				add_custom_target(${POPULE_PACKAGE_TARGET} DEPENDS ${PACKAGE_BINDIR}/${P}${TARGET})
-				add_dependencies(populate ${POPULE_PACKAGE_TARGET})
+				add_dependencies(populate ${POPULE_PACKAGE_TARGET} ${TARGET})
 			elseif(${T} STREQUAL "HTDOCS")
 				add_custom_command(OUTPUT ${PACKAGE_HTTPDIR}-xx
-					DEPENDS ${TARGET}
 					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(populate ${POPULE_PACKAGE_TARGET} ${TARGET})
 			elseif(${T} STREQUAL "DATA")
 				add_custom_command(OUTPUT ${PACKAGE_DATADIR}-xx
-					DEPENDS ${TARGET}
 					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(populate ${POPULE_PACKAGE_TARGET} ${TARGET})
 			endif(${T} STREQUAL "BINDING")
 		elseif(${CMAKE_BUILD_TYPE} MATCHES "[Dd][Ee][Bb][Uu][Gg]")
 			MESSAGE(".. Warning: ${TARGET} ignored when packaging.")
@@ -119,10 +117,10 @@ endmacro(project_targets_populate)
 
 macro(remote_targets_populate)
 	if (DEFINED ENV{RSYNC_TARGET})
-	set (RSYNC_TARGET $ENV{RSYNC_TARGET})
+		set (RSYNC_TARGET $ENV{RSYNC_TARGET})
 	endif()
 	if (DEFINED ENV{RSYNC_PREFIX})
-	set (RSYNC_PREFIX $ENV{RSYNC_PREFIX})
+		set (RSYNC_PREFIX $ENV{RSYNC_PREFIX})
 	endif()
 
 	set(
@@ -142,11 +140,11 @@ macro(remote_targets_populate)
 		configure_files_in_dir(${GDB_TEMPLATE_DIR})
 
 		add_custom_target(remote-target-populate
-			DEPENDS 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_dependencies(remote-target-populate populate)
 	endif()
 endmacro(remote_targets_populate)
 
@@ -185,7 +183,7 @@ macro(wgt_package_build)
 
 	add_custom_target(widget DEPENDS ${PROJECT_NAME}.wgt)
 	add_dependencies(widget populate packaging_wgt)
-	set(ADDITIONAL_MAKE_CLEAN_FILES, "${PROJECT_NAME}.wgt")
+	set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.wgt")
 
 	if(NOT RSYNC_TARGET)
 		message ("${Yellow}.. Warning: RSYNC_TARGET not defined 'make widget-target-install' not instanciated${ColourReset}")
@@ -219,7 +217,6 @@ macro(rpm_package_build)
 
 	add_custom_target(rpm DEPENDS ${NPKG_PROJECT_NAME}.spec)
 	add_dependencies(rpm populate packaging)
-	set(ADDITIONAL_MAKE_CLEAN_FILES, "${PROJECT_NAME}.spec")
 
 	if(PACKAGE_MESSAGE)
 	add_custom_command(TARGET rpm
@@ -274,4 +271,4 @@ macro(project_closing_msg)
 		 add_dependencies(${PROJECT_NAME}_build_done
 		 	${DEPENDENCIES_TARGET} ${PROJECT_TARGETS})
 	endif()
-endmacro()
\ No newline at end of file
+endmacro()