diff options
| author | Orgad Shaneh <orgads@gmail.com> | 2021-04-01 17:03:52 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-04-26 18:27:34 (GMT) |
| commit | ddcd1469e8377fe258913a20aa47e65f71f8695b (patch) | |
| tree | d18b6561383a8f4bc206dac848a15814b74ca642 /Tests/RunCMake/file | |
| parent | b3ca4f9ad18220b2f56cd6af7df5cf1e671d39a8 (diff) | |
| download | CMake-ddcd1469e8377fe258913a20aa47e65f71f8695b.zip CMake-ddcd1469e8377fe258913a20aa47e65f71f8695b.tar.gz CMake-ddcd1469e8377fe258913a20aa47e65f71f8695b.tar.bz2 | |
MSYS: Add support for running under MSYS runtime environment
Detect MSYS as CYGWIN, with the required adaptations.
Diffstat (limited to 'Tests/RunCMake/file')
| -rw-r--r-- | Tests/RunCMake/file/RunCMakeTest.cmake | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Tests/RunCMake/file/RunCMakeTest.cmake b/Tests/RunCMake/file/RunCMakeTest.cmake index 6d1109a..9efd3f4 100644 --- a/Tests/RunCMake/file/RunCMakeTest.cmake +++ b/Tests/RunCMake/file/RunCMakeTest.cmake @@ -87,7 +87,9 @@ run_cmake(GLOB-noexp-RELATIVE) run_cmake_command(GLOB-error-CONFIGURE_DEPENDS-SCRIPT_MODE ${CMAKE_COMMAND} -P ${RunCMake_SOURCE_DIR}/GLOB-error-CONFIGURE_DEPENDS-SCRIPT_MODE.cmake) -if(NOT WIN32 OR CYGWIN) +if(NOT WIN32 + AND NOT MSYS # FIXME: This works on CYGWIN but not on MSYS + ) run_cmake(CREATE_LINK-SYMBOLIC) run_cmake(CREATE_LINK-SYMBOLIC-noexist) run_cmake(GLOB_RECURSE-cyclic-recursion) @@ -162,7 +164,9 @@ else() run_cmake_command(GLOB-CONFIGURE_DEPENDS-RerunCMake-rebuild_second ${CMAKE_COMMAND} --build .) run_cmake_command(GLOB-CONFIGURE_DEPENDS-RerunCMake-nowork ${CMAKE_COMMAND} --build .) - if(NOT WIN32 OR CYGWIN) + if(NOT WIN32 + AND NOT MSYS # FIXME: This works on CYGWIN but not on MSYS + ) message(STATUS "GLOB-CONFIGURE_DEPENDS-CMP0009-RerunCMake: link the first test directory into a new directory...") file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}/test2") execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink "${RunCMake_TEST_BINARY_DIR}/test" "${RunCMake_TEST_BINARY_DIR}/test2/test_folder_symlink") |