Merge topic 'doBuildRPM-withSpaceInTree'
6749450
Do not build RPM if path of the build tree contains space
This commit is contained in:
commit
b187a3a816
|
@ -585,6 +585,14 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
|
||||||
set(CTEST_package_X11_TEST ${CTEST_TEST_CPACK})
|
set(CTEST_package_X11_TEST ${CTEST_TEST_CPACK})
|
||||||
set(CTEST_RUN_CPackComponentsForAll ${CTEST_TEST_CPACK})
|
set(CTEST_RUN_CPackComponentsForAll ${CTEST_TEST_CPACK})
|
||||||
|
|
||||||
|
if (CMAKE_SYSTEM_NAME MATCHES "Linux" AND NOT CMAKE_CURRENT_BINARY_DIR MATCHES ".* .*")
|
||||||
|
find_program(RPMBUILD NAMES rpmbuild)
|
||||||
|
endif(CMAKE_SYSTEM_NAME MATCHES "Linux" AND NOT CMAKE_CURRENT_BINARY_DIR MATCHES ".* .*")
|
||||||
|
# Do not try to build RPM
|
||||||
|
if (NOT RPMBUILD)
|
||||||
|
set(CPACK_BINARY_RPM OFF)
|
||||||
|
endif(NOT RPMBUILD)
|
||||||
|
|
||||||
find_program(NSIS_MAKENSIS_EXECUTABLE NAMES makensis
|
find_program(NSIS_MAKENSIS_EXECUTABLE NAMES makensis
|
||||||
PATHS [HKEY_LOCAL_MACHINE\\SOFTWARE\\NSIS]
|
PATHS [HKEY_LOCAL_MACHINE\\SOFTWARE\\NSIS]
|
||||||
DOC "makensis program location"
|
DOC "makensis program location"
|
||||||
|
|
Loading…
Reference in New Issue