cpp/openttd-patchpack/source Changeset - r28624:364bdb14afa0

Changeset - r28624:364bdb14afa0

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

Patric Stout - 10 months ago 2024-01-30 23:33:21
truebrain@openttd.org

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

Co-authored-by: Stepan Dyatkovskiy (kaomoneus) <ml@dyatkovskiy.com>

1 file changed with 23 insertions and 11 deletions:

cmake/InstallAndPackage.cmake

0 comments (0 inline, 0 general)

cmake/InstallAndPackage.cmake

➞

Show inline comments

@@ @@ -23,16 +23,28 @@ install(TARGETS openttd @@
             COMPONENT Runtime
+        )
 install(DIRECTORY
                 ${CMAKE_BINARY_DIR}/lang
                 ${CMAKE_BINARY_DIR}/baseset
                 ${CMAKE_BINARY_DIR}/ai
                 ${CMAKE_BINARY_DIR}/game
                 ${CMAKE_SOURCE_DIR}/bin/scripts
         DESTINATION ${DATA_DESTINATION_DIR}
         COMPONENT language_files
         REGEX "ai/[^\.]+$" EXCLUDE # Ignore subdirs in ai dir
+)
 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}/baseset
                     ${CMAKE_BINARY_DIR}/ai
                     ${CMAKE_BINARY_DIR}/game
                     ${CMAKE_SOURCE_DIR}/bin/scripts
             DESTINATION ${DATA_DESTINATION_DIR}
             COMPONENT language_files
             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
                 ${CMAKE_SOURCE_DIR}/COPYING.md
@@ @@ -79,7 +91,7 @@ if(OPTION_INSTALL_FHS) @@
             COMPONENT manual)
 endif()
 if(UNIX AND NOT APPLE)
+if(UNIX AND NOT APPLE AND NOT EMSCRIPTEN)
     install(DIRECTORY
                     ${CMAKE_BINARY_DIR}/media/icons
                     ${CMAKE_BINARY_DIR}/media/pixmaps

0 comments (0 inline, 0 general)