diff options
| author | Daniel Wyatt <Daniel.Wyatt@gmail.com> | 2018-06-23 11:42:42 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-06-26 17:25:08 (GMT) |
| commit | 611ad194991950ed32189d7314bdbb6cb7cc673b (patch) | |
| tree | d21d0442aebcd68501ee7ae1f4b69e5b7844c5aa /Modules/Internal | |
| parent | 4b7e9cabc2fceaf4e027c252a98a65c3ad5f26ac (diff) | |
| download | CMake-611ad194991950ed32189d7314bdbb6cb7cc673b.zip CMake-611ad194991950ed32189d7314bdbb6cb7cc673b.tar.gz CMake-611ad194991950ed32189d7314bdbb6cb7cc673b.tar.bz2 | |
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).
Diffstat (limited to 'Modules/Internal')
| -rw-r--r-- | Modules/Internal/CPack/CPackRPM.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
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 |