X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=default%2Fcmake%2Fcommon.cmake;h=05a3236ed2e5b7007f60f2c1c13444493eb5f85f;hb=bd37e33352242ebbc3278e3d6683bf07df0f6649;hp=4a8bd2317af4ed589846f6bca20bdd74e80ea76d;hpb=1e995820bf39f8df634e066249fd74cd5a32d4bd;p=staging%2Fxdg-launcher.git

diff --git a/default/cmake/common.cmake b/default/cmake/common.cmake
index 4a8bd23..05a3236 100644
--- a/default/cmake/common.cmake
+++ b/default/cmake/common.cmake
@@ -201,8 +201,8 @@ macro(wgt_package_build)
 endmacro(wgt_package_build)
 
 macro(rpm_package_build)
-	if(NOT EXISTS ${PROJECT_RPM_DIR}/config.spec.in)
-			MESSAGE(STATUS "Missing mandatory files: you need config.spec.in in ${PROJECT_RPM_DIR} folder.")
+	if(NOT EXISTS ${TEMPLATE_RPM_DIR}/config.spec.in)
+			MESSAGE(STATUS "Missing mandatory files: you need config.spec.in in ${TEMPLATE_RPM_DIR} folder.")
 	else()
 		# extract PROJECT_PKG_DEPS and replace ; by , for RPM spec file
 		get_property(PROJECT_PKG_DEPS GLOBAL PROPERTY PROJECT_PKG_DEPS)
@@ -212,6 +212,7 @@ macro(rpm_package_build)
 
 		# build rpm spec file from template
 		configure_file(${TEMPLATE_RPM_DIR}/config.spec.in ${PROJECT_PKG_BUILD_DIR}/config.spec)
+		configure_file(${TEMPLATE_RPM_DIR}/config.xml.in ${PROJECT_PKG_ENTRY_POINT}/config.xml)
 
 		add_custom_command(OUTPUT ${PROJECT_NAME}.spec
 			DEPENDS ${PROJECT_TARGETS}
@@ -336,15 +337,16 @@ if(PACKAGE_PREFIX)
 else()
 	set(PROJECT_PKG_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/package CACHE PATH "Where the package will be built")
 endif()
+set(PROJECT_PKG_ENTRY_POINT ${CMAKE_SOURCE_DIR}/packaging CACHE PATH "Where package build files, like rpm.spec file or config.xml, are write.")
 
 set (PKG_TEMPLATE_PREFIX ${CMAKE_SOURCE_DIR}/etc CACHE PATH "Default Package Templates Directory")
-set(TEMPLATE_WGT_DIR "${CMAKE_SOURCE_DIR}/conf.d/app-templates/wgt" CACHE PATH "Subpath to a directory where are stored needed files to build widget")
-set(TEMPLATE_RPM_DIR "${CMAKE_SOURCE_DIR}/conf.d/app-templates/rpm" CACHE PATH "Subpath to a directory where are stored needed files to build rpm package")
-set(TEMPLATE_DEB_DIR "${CMAKE_SOURCE_DIR}/conf.d/app-templates/deb" CACHE PATH "Subpath to a directory where are stored needed files to build deb package")
+set(TEMPLATE_WGT_DIR "${CMAKE_SOURCE_DIR}/${PROJECT_APP_TEMPLATES_DIR}/default/wgt" CACHE PATH "Subpath to a directory where are stored needed files to build widget")
+set(TEMPLATE_RPM_DIR "${CMAKE_SOURCE_DIR}/${PROJECT_APP_TEMPLATES_DIR}/default/rpm" CACHE PATH "Subpath to a directory where are stored needed files to build rpm package")
+set(TEMPLATE_DEB_DIR "${CMAKE_SOURCE_DIR}/${PROJECT_APP_TEMPLATES_DIR}/default/deb" CACHE PATH "Subpath to a directory where are stored needed files to build deb package")
 
 # Default Linkflag
 if(NOT BINDINGS_LINK_FLAG)
-	set(BINDINGS_LINK_FLAG "-Wl,--version-script=${CMAKE_SOURCE_DIR}/conf.d/app-templates/cmake/export.map")
+	set(BINDINGS_LINK_FLAG "-Wl,--version-script=${CMAKE_SOURCE_DIR}/${PROJECT_APP_TEMPLATES_DIR}/default/cmake/export.map")
 endif()
 
 # Add a dummy target to enable global dependency order