summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2018-12-07 13:04:21 (GMT)
committerBrad King <brad.king@kitware.com>2018-12-07 13:04:21 (GMT)
commit0becea2d6061e8fa49c5f6a00757efacdd93421a (patch)
tree2aab42037f5c31ab5445e16dac6e96ca893caa13 /Source
parent45c95a3327cbb7f0b1ab61e6d656c1130f34a684 (diff)
parent4a3ae1710ecefedef8c345cd00599b335bc164d2 (diff)
downloadCMake-0becea2d6061e8fa49c5f6a00757efacdd93421a.zip
CMake-0becea2d6061e8fa49c5f6a00757efacdd93421a.tar.gz
CMake-0becea2d6061e8fa49c5f6a00757efacdd93421a.tar.bz2
Merge branch 'cpack-status-callback' into release-3.13
Merge-request: !2696
Diffstat (limited to 'Source')
-rw-r--r--Source/CPack/cpack.cxx10
1 files changed, 10 insertions, 0 deletions
diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx
index c083945..623cdcd 100644
--- a/Source/CPack/cpack.cxx
+++ b/Source/CPack/cpack.cxx
@@ -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());