mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-11 03:50:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cpack-trace-nullptr' into release-3.11

Browse Source 
Merge-request: !1950
This commit is contained in:
Brad King
2018-04-10 15:01:43 -04:00
parent ef077c8ba4 6f2701abf6
commit 3c0fed488f
5 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/CPack/cpack.cxx
View File

@@ -350,16 +350,16 @@ int main(int argc, char const* const* argv)
}
if (parsed) {
cpackGenerator = generators.NewGenerator(gen);
if (!cpackGenerator) {
if (cpackGenerator) {
cpackGenerator->SetTrace(trace);
cpackGenerator->SetTraceExpand(traceExpand);
} else {
cmCPack_Log(&log, cmCPackLog::LOG_ERROR,
"Cannot initialize CPack generator: " << gen
<< std::endl);
parsed = 0;
}
cpackGenerator->SetTrace(trace);
cpackGenerator->SetTraceExpand(traceExpand);
if (parsed && !cpackGenerator->Initialize(gen, mf)) {
cmCPack_Log(&log, cmCPackLog::LOG_ERROR,
"Cannot initialize the generator " << gen

1
Tests/RunCMake/CMakeLists.txt
View File

@@ -335,6 +335,7 @@ add_RunCMake_test(CommandLine -DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME})
add_RunCMake_test(CommandLineTar)
add_RunCMake_test(install)
add_RunCMake_test(CPackCommandLine)
add_RunCMake_test(CPackConfig)
add_RunCMake_test(CPackInstallProperties)
add_RunCMake_test(ExternalProject)

1
Tests/RunCMake/CPackCommandLine/NotAGenerator-result.txt Normal file
View File

@@ -0,0 +1 @@
1

1
Tests/RunCMake/CPackCommandLine/NotAGenerator-stderr.txt Normal file
View File

@@ -0,0 +1 @@
^CPack Error: Cannot initialize CPack generator: NotAGenerator

10
Tests/RunCMake/CPackCommandLine/RunCMakeTest.cmake Normal file
View File

@@ -0,0 +1,10 @@
include(RunCMake)
set(RunCMake_TEST_TIMEOUT 60)
file(WRITE "${RunCMake_BINARY_DIR}/NotAGenerator-build/CPackConfig.cmake" [[
set(CPACK_PACKAGE_NAME "Test")
set(CPACK_PACKAGE_VERSION "1")
]])
set(RunCMake_TEST_NO_CLEAN 1)
run_cmake_command(NotAGenerator ${CMAKE_CPACK_COMMAND} -G NotAGenerator)
unset(RunCMake_TEST_NO_CLEAN)