mirror of
https://github.com/Kitware/CMake.git
synced 2026-05-03 21:00:01 -05:00
Merge topic 'cpack-status-callback'
4a3ae1710e CPack/External: Fix status messages of staging scripts
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2696
This commit is contained in:
@@ -89,6 +89,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)
|
||||
{
|
||||
@@ -202,6 +211,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());
|
||||
|
||||
@@ -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")
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
-- This status message is expected to be visible
|
||||
Reference in New Issue
Block a user