mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Fix #9655: [Emscripten] install the correct files on install (#11934) 

Co-authored-by: Stepan Dyatkovskiy (kaomoneus) <ml@dyatkovskiy.com>
pull/11939/head
Patric Stout 2024-01-31 00:33:21 +01:00 committed by GitHub
parent 16c40d0844
commit 232151788d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cmake/InstallAndPackage.cmake
View File

@ -23,7 +23,10 @@ install(TARGETS openttd
COMPONENT Runtime COMPONENT Runtime
) )
install(DIRECTORY if (NOT EMSCRIPTEN)
# Emscripten embeds these files in openttd.data.
# See CMakeLists.txt in the root.
install(DIRECTORY
${CMAKE_BINARY_DIR}/lang ${CMAKE_BINARY_DIR}/lang
${CMAKE_BINARY_DIR}/baseset ${CMAKE_BINARY_DIR}/baseset
${CMAKE_BINARY_DIR}/ai ${CMAKE_BINARY_DIR}/ai
@ -32,7 +35,16 @@ install(DIRECTORY
DESTINATION ${DATA_DESTINATION_DIR} DESTINATION ${DATA_DESTINATION_DIR}
COMPONENT language_files COMPONENT language_files
REGEX "ai/[^\.]+$" EXCLUDE # Ignore subdirs in ai dir REGEX "ai/[^\.]+$" EXCLUDE # Ignore subdirs in ai dir
) )
else()
install(FILES
${CMAKE_BINARY_DIR}/openttd.js
${CMAKE_BINARY_DIR}/openttd.wasm
${CMAKE_BINARY_DIR}/openttd.data
DESTINATION ${BINARY_DESTINATION_DIR}
COMPONENT Runtime
)
endif()
install(FILES install(FILES
${CMAKE_SOURCE_DIR}/COPYING.md ${CMAKE_SOURCE_DIR}/COPYING.md
@ -79,7 +91,7 @@ if(OPTION_INSTALL_FHS)
COMPONENT manual) COMPONENT manual)
endif() endif()
if(UNIX AND NOT APPLE) if(UNIX AND NOT APPLE AND NOT EMSCRIPTEN)
install(DIRECTORY install(DIRECTORY
${CMAKE_BINARY_DIR}/media/icons ${CMAKE_BINARY_DIR}/media/icons
${CMAKE_BINARY_DIR}/media/pixmaps ${CMAKE_BINARY_DIR}/media/pixmaps