reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2024-11-25 04:29:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CMAKE_ROLE: Fix value in --build for Visual Studio generators

Browse Source 
Fixes: #18990
This commit is contained in:
Kyle Edwards 2019-02-26 14:48:13 -05:00
parent 8455e166a9
commit 4b95e7fe63
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmakemain.cxx
View File

@ -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);
});

4
Tests/RunCMake/CMakeRoleGlobalProperty/Project.cmake
View File

@ -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()

3
Tests/RunCMake/CMakeRoleGlobalProperty/RunCMakeTest.cmake
View File

@ -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)