X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=cmake%2Fcommon.cmake;h=fa7b369b528a9ee031c94469c2bd2fc952d0813e;hb=8ca8aa2c6182de0980956d4dbab68750e85ca58f;hp=524e023440b404c63a8d3a4163890d4a8314b8dc;hpb=1b16a2806eb6a22be45468771f7e72700112d1de;p=staging%2Fxdg-launcher.git

diff --git a/cmake/common.cmake b/cmake/common.cmake
index 524e023..fa7b369 100644
--- a/cmake/common.cmake
+++ b/cmake/common.cmake
@@ -179,66 +179,64 @@ macro(remote_targets_populate)
 endmacro(remote_targets_populate)
 
 macro(wgt_package_build)
-	if(NOT EXISTS ${TEMPLATE_WGT_DIR}/config.xml.in OR NOT EXISTS ${TEMPLATE_WGT_DIR}/icon-default.png)
-		MESSAGE(SEND_ERROR "${Red}WARNING ! Missing mandatory files to build widget file.\nYou need config.xml.in and ${PROJECT_ICON} files in ${TEMPLATE_WGT_DIR} folder.${ColourReset}")
-	else()
-		# Build widget spec file from template only once (Fulup good idea or should depend on time ????)
-		if(NOT EXISTS ${TEMPLATE_WGT_DIR}/config.xml.in OR NOT EXISTS ${TEMPLATE_WGT_DIR}/${PROJECT_ICON})
-			configure_file(${TEMPLATE_WGT_DIR}/config.xml.in ${PROJECT_PKG_BUILD_DIR}/config.xml)
-			configure_file(${TEMPLATE_WGT_DIR}/config.xml.in ${PROJECT_PKG_ENTRY_POINT}/config.xml)
-			file(COPY ${TEMPLATE_WGT_DIR}/icon-default.png DESTINATION ${PROJECT_PKG_BUILD_DIR}/${PROJECT_ICON})
-		endif(NOT EXISTS ${TEMPLATE_WGT_DIR}/config.xml.in OR NOT EXISTS ${TEMPLATE_WGT_DIR}/${PROJECT_ICON})
-
-		# Fulup ??? copy any extra file in wgt/etc into populate package before building the widget
-		file(GLOB PROJECT_CONF_FILES "${TEMPLATE_WGT_DIR}/etc/*")
-		if(${PROJECT_CONF_FILES})
-			file(COPY "${TEMPLATE_WGT_DIR}/etc/*" DESTINATION ${PROJECT_PKG_BUILD_DIR}/etc/)
-		endif(${PROJECT_CONF_FILES})
-
-		add_custom_command(OUTPUT ${PROJECT_NAME}.wgt
-			DEPENDS ${PROJECT_TARGETS}
-			COMMAND wgtpkg-pack -f -o ${PROJECT_NAME}.wgt ${PROJECT_PKG_BUILD_DIR}
-		)
+	if(NOT EXISTS ${WGT_TEMPLATE_DIR}/config.xml.in OR NOT EXISTS ${WGT_TEMPLATE_DIR}/icon-default.png)
+		MESSAGE(FATAL_ERROR "${Red}WARNING ! Missing mandatory files to build widget file.\nYou need config.xml.in and ${PROJECT_ICON} files in ${WGT_TEMPLATE_DIR} folder.${ColourReset}")
+	endif()
 
-		add_custom_target(widget DEPENDS ${PROJECT_NAME}.wgt)
-		add_dependencies(widget populate)
-		set(ADDITIONAL_MAKE_CLEAN_FILES, "${PROJECT_NAME}.wgt")
+	configure_file(${WGT_TEMPLATE_DIR}/config.xml.in ${PROJECT_PKG_BUILD_DIR}/config.xml)
+	configure_file(${WGT_TEMPLATE_DIR}/config.xml.in ${PROJECT_PKG_ENTRY_POINT}/config.xml)
+	file(COPY ${WGT_TEMPLATE_DIR}/icon-default.png DESTINATION ${PROJECT_PKG_BUILD_DIR}/${PROJECT_ICON})
 
-		if(PACKAGE_MESSAGE)
-		add_custom_command(TARGET widget
-			POST_BUILD
-			COMMAND ${CMAKE_COMMAND} -E cmake_echo_color --cyan "++ ${PACKAGE_MESSAGE}")
-		endif()
+	# Fulup ??? copy any extra file in wgt/etc into populate package before building the widget
+	file(GLOB PROJECT_CONF_FILES "${WGT_TEMPLATE_DIR}/etc/*")
+	if(${PROJECT_CONF_FILES})
+		file(COPY "${WGT_TEMPLATE_DIR}/etc/*" DESTINATION ${PROJECT_PKG_BUILD_DIR}/etc/)
+	endif(${PROJECT_CONF_FILES})
+
+	add_custom_command(OUTPUT ${PROJECT_NAME}.wgt
+		DEPENDS ${PROJECT_TARGETS}
+		COMMAND wgtpkg-pack -f -o ${PROJECT_NAME}.wgt ${PROJECT_PKG_BUILD_DIR}
+	)
+
+	add_custom_target(widget DEPENDS ${PROJECT_NAME}.wgt)
+	add_dependencies(widget populate)
+	set(ADDITIONAL_MAKE_CLEAN_FILES, "${PROJECT_NAME}.wgt")
+
+	if(PACKAGE_MESSAGE)
+	add_custom_command(TARGET widget
+		POST_BUILD
+		COMMAND ${CMAKE_COMMAND} -E cmake_echo_color --cyan "++ ${PACKAGE_MESSAGE}")
 	endif()
 endmacro(wgt_package_build)
 
 macro(rpm_package_build)
-	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)
-		foreach (PKFCONF ${PROJECT_PKG_DEPS})
+	if(NOT EXISTS ${RPM_TEMPLATE_DIR}/rpm-config.spec.in)
+		MESSAGE(FATAL_ERROR "${Red}Missing mandatory files: you need rpm-config.spec.in in ${RPM_TEMPLATE_DIR} folder.${ColourReset}")
+	endif()
+
+	# extract PROJECT_PKG_DEPS and replace ; by , for RPM spec file
+	get_property(PROJECT_PKG_DEPS GLOBAL PROPERTY PROJECT_PKG_DEPS)
+	foreach (PKFCONF ${PROJECT_PKG_DEPS})
 		set(RPM_PKG_DEPS "${RPM_PKG_DEPS}, pkgconfig(${PKFCONF})")
-		endforeach()
+	endforeach()
 
-		# build rpm spec file from template
-		configure_file(${TEMPLATE_RPM_DIR}/config.spec.in ${PROJECT_PKG_BUILD_DIR}/config.spec)
+	# build rpm spec file from template
+	configure_file(${RPM_TEMPLATE_DIR}/rpm-config.spec.in ${PROJECT_PKG_BUILD_DIR}/${PROJECT_NAME}.spec)
+	configure_file(${RPM_TEMPLATE_DIR}/rpm-config.spec.in ${PROJECT_PKG_ENTRY_POINT}/${PROJECT_NAME}.spec)
 
-		add_custom_command(OUTPUT ${PROJECT_NAME}.spec
-			DEPENDS ${PROJECT_TARGETS}
-			COMMAND rpmbuild -ba  ${PROJECT_PKG_BUILD_DIR}/config.spec
-		)
+	add_custom_command(OUTPUT ${PROJECT_NAME}.spec
+		DEPENDS ${PROJECT_TARGETS}
+		COMMAND rpmbuild -ba  ${PROJECT_PKG_BUILD_DIR}/${PROJECT_NAME}.spec
+	)
 
-		add_custom_target(rpm DEPENDS ${PROJECT_NAME}.spec)
-		add_dependencies(rpm populate)
-		set(ADDITIONAL_MAKE_CLEAN_FILES, "${PROJECT_NAME}.spec")
+	add_custom_target(rpm DEPENDS ${PROJECT_NAME}.spec)
+	add_dependencies(rpm populate)
+	set(ADDITIONAL_MAKE_CLEAN_FILES, "${PROJECT_NAME}.spec")
 
-		if(PACKAGE_MESSAGE)
-		add_custom_command(TARGET rpm
-			POST_BUILD
-			COMMAND ${CMAKE_COMMAND} -E cmake_echo_color --cyan "++ ${PACKAGE_MESSAGE}")
-		endif()
+	if(PACKAGE_MESSAGE)
+	add_custom_command(TARGET rpm
+		POST_BUILD
+		COMMAND ${CMAKE_COMMAND} -E cmake_echo_color --cyan "++ ${PACKAGE_MESSAGE}")
 	endif()
 endmacro(rpm_package_build)
 
@@ -312,7 +310,13 @@ set(CMAKE_CXX_FLAGS_DEBUG        "-g -O0 -ggdb -Wp,-U_FORTIFY_SOURCE")
 set(CMAKE_CXX_FLAGS_RELEASE      "-g -O2")
 set(CMAKE_CXX_FLAGS_CCOV "-g -O2 --coverage")
 
-set(CMAKE_INSTALL_PREFIX      "${CMAKE_SOURCE_DIR}/Install" CACHE PATH "The path where to install")
+# Env variable overload default
+if(DEFINED ENV{INSTALL_PREFIX})
+	set (INSTALL_PREFIX $ENV{INSTALL_PREFIX})
+else()
+	set(INSTALL_PREFIX "${CMAKE_SOURCE_DIR}/Install" CACHE PATH "The path where to install")
+endif()
+set(CMAKE_INSTALL_PREFIX ${INSTALL_PREFIX} CACHE STRING "Installation Prefix" FORCE)
 
 # (BUG!!!) as PKG_CONFIG_PATH does not work [should be en env variable]
 set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH ON CACHE BOOLEAN "Flag for using prefix path")