From 9730362202b6372b31b2ee101b9f04b1238fdad4 Mon Sep 17 00:00:00 2001 From: Cosmin Truta Date: Fri, 10 Aug 2018 00:58:48 -0400 Subject: CMakeLists: Avoid symlinks on MSYS create_symlink breaks the MSYS generator in the Windows CMake. --- CMakeLists.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 60d9c4819..9347d4e5c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -802,17 +802,17 @@ function(CREATE_SYMLINK DEST_FILE) # If we don't need to symlink something that's coming from a build target, # we can go ahead and symlink/copy at configure time. - if(CMAKE_HOST_WIN32 AND NOT CYGWIN AND NOT MSYS) + if(CMAKE_HOST_WIN32 AND NOT CYGWIN) execute_process( COMMAND "${CMAKE_COMMAND}" -E copy_if_different ${S_FILE} ${DEST_FILE} WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" ) - else(CMAKE_HOST_WIN32 AND NOT CYGWIN AND NOT MSYS) + else(CMAKE_HOST_WIN32 AND NOT CYGWIN) execute_process( COMMAND ${CMAKE_COMMAND} -E create_symlink ${S_FILE} ${DEST_FILE} WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" ) - endif(CMAKE_HOST_WIN32 AND NOT CYGWIN AND NOT MSYS) + endif(CMAKE_HOST_WIN32 AND NOT CYGWIN) endif(S_FILE) if(S_TARGET) @@ -820,15 +820,15 @@ function(CREATE_SYMLINK DEST_FILE) # simplicity make the symlink a POST_BUILD step and use the TARGET # signature of add_custom_command. - if(CMAKE_HOST_WIN32 AND NOT CYGWIN AND NOT MSYS) + if(CMAKE_HOST_WIN32 AND NOT CYGWIN) add_custom_command(TARGET ${S_TARGET} POST_BUILD COMMAND "${CMAKE_COMMAND}" -E copy_if_different $ $/${DEST_FILE} ) - else(CMAKE_HOST_WIN32 AND NOT CYGWIN AND NOT MSYS) + else(CMAKE_HOST_WIN32 AND NOT CYGWIN) add_custom_command(TARGET ${S_TARGET} POST_BUILD COMMAND "${CMAKE_COMMAND}" -E create_symlink $ $/${DEST_FILE} ) - endif(CMAKE_HOST_WIN32 AND NOT CYGWIN AND NOT MSYS) + endif(CMAKE_HOST_WIN32 AND NOT CYGWIN) endif(S_TARGET) -- cgit v1.2.1