diff options
| author | Brad King <brad.king@kitware.com> | 2019-02-27 08:05:55 -0500 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-02-27 08:05:55 -0500 |
| commit | f369d59cddecf9f6a3b28329ab11b5f354c229bd (patch) | |
| tree | a0b5cb6d5966e47998b4cd6aa48930e0a3689361 | |
| parent | c2c7b9605c7e2c095c342c0641fc44875df89942 (diff) | |
| parent | 4b95e7fe63d254b8e50f09f85a51e232a7470c7b (diff) | |
| download | cmake-f369d59cddecf9f6a3b28329ab11b5f354c229bd.tar.gz | |
Merge branch 'cmake_role-vs-fix' into release-3.14
Merge-request: !3028
| -rw-r--r-- | Source/cmakemain.cxx | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/CMakeRoleGlobalProperty/Project.cmake | 4 | ||||
| -rw-r--r-- | Tests/RunCMake/CMakeRoleGlobalProperty/RunCMakeTest.cmake | 3 |
3 files changed, 8 insertions, 1 deletions
diff --git a/Source/cmakemain.cxx b/Source/cmakemain.cxx index 890b74e0f2..a83f7dc8b5 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 c0b6a48c19..22cad2bbaa 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 3cbd51d6e3..7b29c28b87 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) |