diff options
| author | Cosmin Truta <ctruta@gmail.com> | 2018-08-10 00:58:48 -0400 |
|---|---|---|
| committer | Cosmin Truta <ctruta@gmail.com> | 2018-08-10 00:58:48 -0400 |
| commit | 9730362202b6372b31b2ee101b9f04b1238fdad4 (patch) | |
| tree | 11468f610c4eea182b0f2f35491c34d13770cdd0 /CMakeLists.txt | |
| parent | 7cb7afb43d5fc721c0dd6e278fad87ae13d1d404 (diff) | |
| download | libpng-9730362202b6372b31b2ee101b9f04b1238fdad4.tar.gz | |
CMakeLists: Avoid symlinks on MSYS
create_symlink breaks the MSYS generator in the Windows CMake.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 12 |
1 files 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 $<TARGET_LINKER_FILE_NAME:${S_TARGET}> $<TARGET_LINKER_FILE_DIR:${S_TARGET}>/${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 $<TARGET_LINKER_FILE_NAME:${S_TARGET}> $<TARGET_LINKER_FILE_DIR:${S_TARGET}>/${DEST_FILE} ) - endif(CMAKE_HOST_WIN32 AND NOT CYGWIN AND NOT MSYS) + endif(CMAKE_HOST_WIN32 AND NOT CYGWIN) endif(S_TARGET) |