diff options
| -rwxr-xr-x | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | cmake/install_macros.cmake | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 51a50f682ba..b68bf2ae108 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -239,3 +239,5 @@ INSTALL(FILES COPYING EXCEPTIONS-CLIENT README DESTINATION .) IF(UNIX) INSTALL(FILES Docs/INSTALL-BINARY DESTINATION .) ENDIF() +GET_TARGET_PROPERTY(mysqld_location mysqld LOCATION) +INSTALL(FILES ${mysqld_location} DESTINATION win) diff --git a/cmake/install_macros.cmake b/cmake/install_macros.cmake index 3a5529efc15..3925ce292de 100644 --- a/cmake/install_macros.cmake +++ b/cmake/install_macros.cmake @@ -60,8 +60,11 @@ IF(UNIX) ALL DEPENDS ${output}) SET_TARGET_PROPERTIES(symlink_${linkbasename}${ext} PROPERTIES CLEAN_DIRECT_OUTPUT 1) - # For Xcode, replace project config with install config - STRING(REPLACE "${CMAKE_CFG_INTDIR}" "\${CMAKE_INSTALL_CONFIG_NAME}" output ${output}) + IF(CMAKE_GENERATOR MATCHES "Xcode") + # For Xcode, replace project config with install config + STRING(REPLACE "${CMAKE_CFG_INTDIR}" + "\${CMAKE_INSTALL_CONFIG_NAME}" output ${output}) + ENDIF() INSTALL(FILES ${output} DESTINATION ${destination}) ENDIF() ENDMACRO() |