diff options
| author | David Cole <david.cole@kitware.com> | 2011-10-18 19:02:47 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-10-18 19:02:47 (GMT) |
| commit | fe09546f8ba0cb8591efdf3588c61c0224d753ef (patch) | |
| tree | 99fbdc5a66edfa2ee9cd73f7cd51b92b506ee23f | |
| parent | 56b153d3e5205c4eaa9ea82f26c7933f1107e955 (diff) | |
| parent | 0d44ce2bf4ced68e6d61b1733002988e0a8e6a40 (diff) | |
| download | CMake-fe09546f8ba0cb8591efdf3588c61c0224d753ef.zip CMake-fe09546f8ba0cb8591efdf3588c61c0224d753ef.tar.gz CMake-fe09546f8ba0cb8591efdf3588c61c0224d753ef.tar.bz2 | |
Merge topic 'SilentMakeOutputOnBSD'
0d44ce2 Silence make on OpenBSD in FindPackageModeTest(#12508)
| -rw-r--r-- | Tests/FindPackageModeMakefileTest/CMakeLists.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Tests/FindPackageModeMakefileTest/CMakeLists.txt b/Tests/FindPackageModeMakefileTest/CMakeLists.txt index def8d63..3674f0e 100644 --- a/Tests/FindPackageModeMakefileTest/CMakeLists.txt +++ b/Tests/FindPackageModeMakefileTest/CMakeLists.txt @@ -7,6 +7,7 @@ if(UNIX AND "${CMAKE_GENERATOR}" MATCHES "Makefile") # is AFAIK a GNU make extension. Alex execute_process(COMMAND ${CMAKE_MAKE_PROGRAM} -v OUTPUT_VARIABLE makeVersionOutput + ERROR_QUIET TIMEOUT 10) string(TOUPPER "${makeVersionOutput}" MAKE_VERSION_OUTPUT) if("${MAKE_VERSION_OUTPUT}" MATCHES ".*GNU MAKE.*") |