diff options
author | Alexey Volkov <ark@ark-kun.com> | 2016-04-26 10:19:58 +0300 |
---|---|---|
committer | Alexey Volkov <ark@ark-kun.com> | 2016-04-26 10:19:58 +0300 |
commit | aa46254d4c42186d45ff5b076679734142bdd564 (patch) | |
tree | db18380cd10e9e486230fe15af8b4862e28b1565 | |
parent | 3a64814592231e6557f4cacbd2e42cd0caec7939 (diff) |
Fixed the installation of external binary tools and libraries on Windows.
-rw-r--r-- | luarocks/CMakeLists.txt | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/luarocks/CMakeLists.txt b/luarocks/CMakeLists.txt index a6c0f41..a9fc601 100644 --- a/luarocks/CMakeLists.txt +++ b/luarocks/CMakeLists.txt @@ -27,19 +27,29 @@ SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" IF(WIN32) SET(WINUTILS_DLL_FILES - win32/bin/7z.dll win32/bin/libeay32.dll win32/bin/libiconv2.dll - win32/bin/libintl3.dll win32/bin/libssl32.dll) + win32/tools/7z.dll win32/tools/libeay32.dll win32/tools/libiconv2.dll + win32/tools/libintl3.dll win32/tools/libssl32.dll) - INSTALL(FILES ${WINUTILS_DLL_FILES} DESTINATION "${INSTALL_BIN_SUBDIR}") + INSTALL(FILES ${WINUTILS_DLL_FILES} DESTINATION "${INSTALL_BIN_SUBDIR}/tools/") SET(WINUTILS_EXE_FILES - win32/bin/7z.exe win32/bin/chmod.exe win32/bin/cp.exe - win32/bin/find.exe win32/bin/ls.exe win32/bin/md5sum.exe - win32/bin/mkdir.exe win32/bin/mv.exe win32/bin/objdump.exe - win32/bin/pwd.exe win32/bin/rm.exe win32/bin/rmdir.exe - win32/bin/test.exe win32/bin/uname.exe win32/bin/wget.exe) - - INSTALL(PROGRAMS ${WINUTILS_EXE_FILES} DESTINATION "${INSTALL_BIN_SUBDIR}") + win32/tools/7z.exe +# win32/tools/chmod.exe + win32/tools/cp.exe + win32/tools/find.exe + win32/tools/ls.exe + win32/tools/md5sum.exe + win32/tools/mkdir.exe + win32/tools/mv.exe +# win32/tools/objdump.exe + win32/tools/pwd.exe +# win32/tools/rm.exe + win32/tools/rmdir.exe + win32/tools/test.exe + win32/tools/uname.exe + win32/tools/wget.exe) + + INSTALL(PROGRAMS ${WINUTILS_EXE_FILES} DESTINATION "${INSTALL_BIN_SUBDIR}/tools/") SET(WGET_EXECUTABLE_NAME "wget") SET(MD5_EXECUTABLE_NAME "md5sum") |