mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-29 02:19:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cpack-status-callback' into release-3.13

Browse Source 
Merge-request: !2696
This commit is contained in:
Brad King
2018-12-07 08:04:21 -05:00
parent 45c95a3327 4a3ae1710e
commit 0becea2d60
3 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/CPack/cpack.cxx
+10
View File
@@ -88,6 +88,15 @@ int cpackDefinitionArgument(const char* argument, const char* cValue,
return 1;
}
static void cpackProgressCallback(const char* message, float progress,
void* clientdata)
{
(void)progress;
(void)clientdata;
std::cout << "-- " << message << std::endl;
}
// this is CPack.
int main(int argc, char const* const* argv)
{
@@ -201,6 +210,7 @@ int main(int argc, char const* const* argv)
cmake cminst(cmake::RoleScript);
cminst.SetHomeDirectory("");
cminst.SetHomeOutputDirectory("");
cminst.SetProgressCallback(cpackProgressCallback, nullptr);
cminst.GetCurrentSnapshot().SetDefaultDefinitions();
cmGlobalGenerator cmgg(&cminst);
cmMakefile globalMF(&cmgg, cminst.GetCurrentSnapshot());
Tests/RunCMake/CPack/tests/EXTERNAL/create_package.cmake
+2
View File
@@ -22,3 +22,5 @@ expect_file(${CPACK_TEMPORARY_DIRECTORY}/f1/share/cpack-test/f1.txt)
expect_file(${CPACK_TEMPORARY_DIRECTORY}/f2/share/cpack-test/f2.txt)
expect_file(${CPACK_TEMPORARY_DIRECTORY}/f3/share/cpack-test/f3.txt)
expect_file(${CPACK_TEMPORARY_DIRECTORY}/f4/share/cpack-test/f4.txt)
message(STATUS "This status message is expected to be visible")
Tests/RunCMake/CPack/tests/EXTERNAL/stage_and_package-stdout.txt
+1
View File
@@ -0,0 +1 @@
-- This status message is expected to be visible