From 611ad194991950ed32189d7314bdbb6cb7cc673b Mon Sep 17 00:00:00 2001 From: Daniel Wyatt Date: Sat, 23 Jun 2018 07:42:42 -0400 Subject: CPack/RPM: Use CMAKE_COMMAND to reference cmake executable Ensure we use the `cmake` corresponding to the running `cpack` even if it is not first in `PATH` or has had its name changed. This was accidentally left out in commit v3.7.0-rc1~81^2 (CPack/RPM: Generate source rpm (SRPM) packages on demand, 2016-09-19). --- Modules/Internal/CPack/CPackRPM.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/Internal/CPack/CPackRPM.cmake b/Modules/Internal/CPack/CPackRPM.cmake index d044f05..06298d7 100644 --- a/Modules/Internal/CPack/CPackRPM.cmake +++ b/Modules/Internal/CPack/CPackRPM.cmake @@ -1525,7 +1525,7 @@ ${TMP_DEBUGINFO_ADDITIONAL_SOURCES} %build mkdir cpack_rpm_build_dir cd cpack_rpm_build_dir -cmake ${CPACK_RPM_SOURCE_PKG_BUILD_PARAMS} -DCPACK_PACKAGING_INSTALL_PREFIX=${CPACK_RPM_SOURCE_PKG_PACKAGING_INSTALL_PREFIX} ../${CPACK_PACKAGE_FILE_NAME} +'${CMAKE_COMMAND}' ${CPACK_RPM_SOURCE_PKG_BUILD_PARAMS} -DCPACK_PACKAGING_INSTALL_PREFIX=${CPACK_RPM_SOURCE_PKG_PACKAGING_INSTALL_PREFIX} ../${CPACK_PACKAGE_FILE_NAME} make %{?_smp_mflags}" # %{?_smp_mflags} -> -j option ) set(TMP_RPM_INSTALL -- cgit v0.12