From a6a78cef00609e9666a319ffc9d248cc264ce0d4 Mon Sep 17 00:00:00 2001 From: WerWolv Date: Thu, 20 Feb 2025 11:29:39 +0100 Subject: [PATCH] build: Make sure plugin libraries don't end up in lib folder --- .gitignore | 1 + cmake/build_helpers.cmake | 14 ++++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index a199a2d2b..3a04116a2 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ build*/ local/ venv/ .cache/ +install/ *.mgc *.kdev4 diff --git a/cmake/build_helpers.cmake b/cmake/build_helpers.cmake index ea9d19fe3..b24f9b5fa 100644 --- a/cmake/build_helpers.cmake +++ b/cmake/build_helpers.cmake @@ -925,11 +925,17 @@ function(generateSDKDirectory) install(DIRECTORY ${CMAKE_SOURCE_DIR}/cmake/sdk/ DESTINATION "${SDK_PATH}") install(TARGETS libimhex ARCHIVE DESTINATION "${SDK_PATH}/lib") - install(DIRECTORY ${CMAKE_SOURCE_DIR}/plugins/ui DESTINATION "${SDK_PATH}/lib" PATTERN "**/source/*" EXCLUDE) - install(TARGETS ui ARCHIVE DESTINATION "${SDK_PATH}/lib") + install(DIRECTORY ${CMAKE_SOURCE_DIR}/plugins/ui/include DESTINATION "${SDK_PATH}/lib/ui/include") + install(FILES ${CMAKE_SOURCE_DIR}/plugins/ui/CMakeLists.txt DESTINATION "${SDK_PATH}/lib/ui/") + if (WIN32) + install(TARGETS ui ARCHIVE DESTINATION "${SDK_PATH}/lib") + endif() - install(DIRECTORY ${CMAKE_SOURCE_DIR}/plugins/fonts DESTINATION "${SDK_PATH}/lib" PATTERN "**/source/*" EXCLUDE) - install(TARGETS fonts ARCHIVE DESTINATION "${SDK_PATH}/lib") + install(DIRECTORY ${CMAKE_SOURCE_DIR}/plugins/fonts/include DESTINATION "${SDK_PATH}/lib/fonts/include") + install(FILES ${CMAKE_SOURCE_DIR}/plugins/fonts/CMakeLists.txt DESTINATION "${SDK_PATH}/lib/fonts/") + if (WIN32) + install(TARGETS fonts ARCHIVE DESTINATION "${SDK_PATH}/lib") + endif() endfunction() function(addIncludesFromLibrary target library)