From 1875faec9d80272f4843d2f1abb5008e91bcf658 Mon Sep 17 00:00:00 2001 From: Georgi Gerganov Date: Sun, 28 Feb 2021 08:02:13 +0000 Subject: [PATCH] cmake : fix emscripten install targets --- examples/CMakeLists.txt | 10 ++++++++-- examples/third-party/ggsock | 2 +- examples/third-party/imgui/CMakeLists.txt | 10 ++++++++-- src/CMakeLists.txt | 5 ++++- 4 files changed, 21 insertions(+), 6 deletions(-) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 4434c5f..1a44b4b 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -100,8 +100,14 @@ if (GGWAVE_SUPPORT_SDL2) add_subdirectory(spectrogram) endif() -install(TARGETS ggwave-common LIBRARY DESTINATION lib) +install(TARGETS ggwave-common + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib/static + ) if (GGWAVE_SUPPORT_SDL2) - install(TARGETS ggwave-common-sdl2 LIBRARY DESTINATION lib) + install(TARGETS ggwave-common-sdl2 + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib/static + ) endif() diff --git a/examples/third-party/ggsock b/examples/third-party/ggsock index e1a2377..cb2f795 160000 --- a/examples/third-party/ggsock +++ b/examples/third-party/ggsock @@ -1 +1 @@ -Subproject commit e1a2377de44a23e42654cd4e7fd44313c57e4cf6 +Subproject commit cb2f795301a59bcd03f3cabca72a7767a9ff0cbc diff --git a/examples/third-party/imgui/CMakeLists.txt b/examples/third-party/imgui/CMakeLists.txt index b0df6ae..b3d39ab 100644 --- a/examples/third-party/imgui/CMakeLists.txt +++ b/examples/third-party/imgui/CMakeLists.txt @@ -124,8 +124,14 @@ if (GGWAVE_SUPPORT_SDL2) endif() endif() -install(TARGETS imgui LIBRARY DESTINATION lib) +install(TARGETS imgui + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib/static + ) if (GGWAVE_SUPPORT_SDL2) - install(TARGETS imgui-sdl2 LIBRARY DESTINATION lib) + install(TARGETS imgui-sdl2 + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib/static + ) endif() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9c5cd2e..ccf0b43 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -28,4 +28,7 @@ if (MINGW) ) endif() -install(TARGETS ${TARGET} LIBRARY DESTINATION lib) +install(TARGETS ${TARGET} + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib/static + )