This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via 557d4b5882f0ea1e1ad7eb1d59674e8683e23058 (commit)
via e795be115e9c40d6092958d64f251db435acc4ba (commit)
via 4b95e7fe63d254b8e50f09f85a51e232a7470c7b (commit)
from 8c3172e7c265d54ce02766db7ef1166f68bf897f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=557d4b5882f0ea1e1ad7eb1d59674e8683e23058
commit 557d4b5882f0ea1e1ad7eb1d59674e8683e23058
Merge: 8c3172e e795be1
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Feb 27 13:09:36 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Wed Feb 27 08:09:42 2019 -0500
Merge topic 'cmake_role-vs-fix'
e795be115e Merge branch 'master' into cmake_role-vs-fix
4b95e7fe63 CMAKE_ROLE: Fix value in --build for Visual Studio generators
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3028
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e795be115e9c40d6092958d64f251db435acc4ba
commit e795be115e9c40d6092958d64f251db435acc4ba
Merge: 4b95e7f 78ff8d5
Author: Kyle Edwards <kyle.edwa...@kitware.com>
AuthorDate: Tue Feb 26 17:28:04 2019 -0500
Commit: Kyle Edwards <kyle.edwa...@kitware.com>
CommitDate: Tue Feb 26 17:28:04 2019 -0500
Merge branch 'master' into cmake_role-vs-fix
diff --cc Source/cmakemain.cxx
index a83f7dc,09068f8..e6f4021
--- a/Source/cmakemain.cxx
+++ b/Source/cmakemain.cxx
@@@ -498,11 -500,12 +500,12 @@@ static int do_build(int ac, char const
return 1;
}
- cmake cm(cmake::RoleInternal, cmState::Unknown);
+ cmake cm(cmake::RoleInternal, cmState::Project);
- cmSystemTools::SetMessageCallback([&cm](const char* msg, const char* title)
{
- cmakemainMessageCallback(msg, title, &cm);
- });
- cm.SetProgressCallback([&cm](const char* msg, float prog) {
+ cmSystemTools::SetMessageCallback(
+ [&cm](const std::string& msg, const char* title) {
+ cmakemainMessageCallback(msg, title, &cm);
+ });
+ cm.SetProgressCallback([&cm](const std::string& msg, float prog) {
cmakemainProgressCallback(msg, prog, &cm);
});
return cm.Build(jobs, dir, target, config, nativeOptions, clean, verbose);
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4b95e7fe63d254b8e50f09f85a51e232a7470c7b
commit 4b95e7fe63d254b8e50f09f85a51e232a7470c7b
Author: Kyle Edwards <kyle.edwa...@kitware.com>
AuthorDate: Tue Feb 26 14:48:13 2019 -0500
Commit: Kyle Edwards <kyle.edwa...@kitware.com>
CommitDate: Tue Feb 26 14:52:17 2019 -0500
CMAKE_ROLE: Fix value in --build for Visual Studio generators
Fixes: #18990
diff --git a/Source/cmakemain.cxx b/Source/cmakemain.cxx
index 890b74e..a83f7dc 100644
--- a/Source/cmakemain.cxx
+++ b/Source/cmakemain.cxx
@@ -498,7 +498,7 @@ static int do_build(int ac, char const* const* av)
return 1;
}
- cmake cm(cmake::RoleInternal, cmState::Unknown);
+ cmake cm(cmake::RoleInternal, cmState::Project);
cmSystemTools::SetMessageCallback([&cm](const char* msg, const char* title) {
cmakemainMessageCallback(msg, title, &cm);
});
diff --git a/Tests/RunCMake/CMakeRoleGlobalProperty/Project.cmake
b/Tests/RunCMake/CMakeRoleGlobalProperty/Project.cmake
index c0b6a48..22cad2b 100644
--- a/Tests/RunCMake/CMakeRoleGlobalProperty/Project.cmake
+++ b/Tests/RunCMake/CMakeRoleGlobalProperty/Project.cmake
@@ -1,4 +1,8 @@
get_property(role GLOBAL PROPERTY CMAKE_ROLE)
+
+file(WRITE "${CMAKE_BINARY_DIR}/test.cmake" "# a")
+include("${CMAKE_BINARY_DIR}/test.cmake")
+
if(NOT role STREQUAL "PROJECT")
message(SEND_ERROR "CMAKE_ROLE property is \"${role}\", should be
\"PROJECT\"")
endif()
diff --git a/Tests/RunCMake/CMakeRoleGlobalProperty/RunCMakeTest.cmake
b/Tests/RunCMake/CMakeRoleGlobalProperty/RunCMakeTest.cmake
index 3cbd51d..7b29c28 100644
--- a/Tests/RunCMake/CMakeRoleGlobalProperty/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CMakeRoleGlobalProperty/RunCMakeTest.cmake
@@ -2,6 +2,9 @@ include(RunCMake)
include(RunCTest)
run_cmake(Project)
+file(WRITE "${RunCMake_BINARY_DIR}/Project-build/test.cmake" "# b")
+run_cmake_command(ProjectBuild "${CMAKE_COMMAND}" --build
"${RunCMake_BINARY_DIR}/Project-build")
+
run_cmake_command(Script "${CMAKE_COMMAND}" -P
"${CMAKE_CURRENT_LIST_DIR}/Script.cmake")
run_cmake_command(FindPackage "${CMAKE_COMMAND}" --find-package
-DNAME=DummyPackage -DCOMPILER_ID=GNU -DLANGUAGE=CXX -DMODE=EXIST
"-DCMAKE_MODULE_PATH=${CMAKE_CURRENT_LIST_DIR}")
run_ctest(CTest)
-----------------------------------------------------------------------
Summary of changes:
Source/cmakemain.cxx | 2 +-
Tests/RunCMake/CMakeRoleGlobalProperty/Project.cmake | 4 ++++
Tests/RunCMake/CMakeRoleGlobalProperty/RunCMakeTest.cmake | 3 +++
3 files changed, 8 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
