@@ -33,20 +33,6 @@ if(WIN32)
3333 DESTINATION ${CMAKE_CURRENT_LIST_DIR}
3434 )
3535 endif ()
36-
37- set (LUA_LOGO lua-logo-nolabel.ps)
38- if (NOT EXISTS ${CMAKE_CURRENT_LIST_DIR} /${LUA_LOGO} )
39- file (DOWNLOAD https://www.lua.org/images/${LUA_LOGO}
40- ${CMAKE_CURRENT_LIST_DIR} /${LUA_LOGO}
41- )
42- endif ()
43-
44- add_custom_command (OUTPUT lua.ico
45- COMMAND magick ${CMAKE_CURRENT_LIST_DIR} /${LUA_LOGO} -resize 256x256 lua.ico
46- MAIN_DEPENDENCY ${CMAKE_CURRENT_LIST_DIR} /${LUA_LOGO}
47- COMMENT "Generating Lua icon"
48- )
49- add_custom_target (luaicon ALL DEPENDS lua.ico)
5036endif ()
5137
5238set (LUA_SRC lua-${CMAKE_PROJECT_VERSION} /src)
@@ -128,19 +114,22 @@ endif()
128114
129115install (TARGETS lua luac)
130116install (TARGETS lualib FILE_SET include )
117+ install (FILES ${CMAKE_CURRENT_LIST_DIR} /LICENSE.txt TYPE DOC )
131118
132119if (WIN32 )
133- set (CPACK_GENERATOR ZIP WIX)
134- set (CPACK_WIX_UPGRADE_GUID "3e5a792d-9d31-41d5-a93f-629ab7c7683d" )
135- set (CPACK_WIX_PRODUCT_ICON lua.ico)
136- list (APPEND CPACK_WIX_EXTENSIONS WixUtilExtension)
137- list (APPEND CPACK_WIX_PATCH_FILE ${CMAKE_CURRENT_LIST_DIR} /WixPatch.xml)
120+ set (CPACK_GENERATOR ZIP)
121+ install (FILES
122+ ${CMAKE_CURRENT_BINARY_DIR} /lua.pdb
123+ ${CMAKE_CURRENT_BINARY_DIR} /luac.pdb
124+ ${CMAKE_CURRENT_BINARY_DIR} /lua54.pdb
125+ DESTINATION bin)
138126else ()
139127 install (FILES ${LUA_DOC} /lua.1 ${LUA_DOC} /luac.1
140128 DESTINATION man/man1
141129 )
142130endif ()
143- set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_LIST_DIR} /LICENSE.txt" )
131+ set (CPACK_INCLUDE_TOPLEVEL_DIRECTORY OFF )
132+ set (CPACK_RESOURCE_FILE_LICENSE ${CMAKE_CURRENT_LIST_DIR} /LICENSE.txt)
144133set (CPACK_PACKAGE_INSTALL_DIRECTORY ${CMAKE_PROJECT_NAME} )
145134set (CPACK_PACKAGE_VENDOR DEVCOM)
146135include (CPack)
0 commit comments