X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=default%2Fcmake%2Fmacros.cmake;h=9650ad030f8b25d31f5daf8dbe0eb953a1cc6316;hb=15d1830a8520fdf1a1950083ff8be6ba3a00b9be;hp=b1a5f689762fd848b6f40564254450015ee1d9cc;hpb=6d55c85990ce83b038809cb957759d0cd09dc38c;p=staging%2Fxdg-launcher.git diff --git a/default/cmake/macros.cmake b/default/cmake/macros.cmake index b1a5f68..9650ad0 100644 --- a/default/cmake/macros.cmake +++ b/default/cmake/macros.cmake @@ -166,8 +166,8 @@ macro(wgt_package_build) endmacro(wgt_package_build) macro(rpm_package_build) - if(NOT EXISTS ${PROJECT_RPM_DIR}/config.rpm.in) - MESSAGE(STATUS "Missing mandatory files: you needconfig.rpm.in in ${PROJECT_RPM_DIR} folder.") + if(NOT EXISTS ${PROJECT_RPM_DIR}/config.spec.in) + MESSAGE(STATUS "Missing mandatory files: you need config.spec.in in ${PROJECT_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) @@ -176,16 +176,16 @@ macro(rpm_package_build) endforeach() # build rpm spec file from template - configure_file(${PROJECT_RPM_DIR}/config.rpm.in ${PROJECT_PKG_DIR}/config.rpm) + configure_file(${PROJECT_RPM_DIR}/config.spec.in ${PROJECT_PKG_DIR}/config.spec) - add_custom_command(OUTPUT ${PROJECT_NAME}.rpm + add_custom_command(OUTPUT ${PROJECT_NAME}.spec DEPENDS ${PROJECT_TARGETS} - COMMAND rpmbuild -ba ${PROJECT_PKG_DIR}/config.rpm + COMMAND rpmbuild -ba ${PROJECT_PKG_DIR}/config.spec ) - add_custom_target(rpm DEPENDS ${PROJECT_NAME}.rpm) + add_custom_target(rpm DEPENDS ${PROJECT_NAME}.spec) add_dependencies(rpm populate) - set(ADDITIONAL_MAKE_CLEAN_FILES, "${PROJECT_NAME}.rpm") + set(ADDITIONAL_MAKE_CLEAN_FILES, "${PROJECT_NAME}.spec") if(PACKAGE_MESSAGE) add_custom_command(TARGET rpm