From f1ba29e4a05b73cb3bb5006a79549ccadf219c7e Mon Sep 17 00:00:00 2001 From: Anonymous Maarten Date: Thu, 5 Jun 2025 04:05:59 +0200 Subject: [PATCH] cmake: try to make CMake install package more usable --- CMakeLists.txt | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 76b08e91..020fe8df 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,6 @@ cmake_minimum_required(VERSION 3.25...4.0 FATAL_ERROR) project(isle LANGUAGES CXX C VERSION 0.1) if (EMSCRIPTEN) - set(CMAKE_EXECUTABLE_SUFFIX ".html") add_compile_options(-pthread) add_link_options(-sALLOW_MEMORY_GROWTH=1 -sMAXIMUM_MEMORY=2gb -sUSE_PTHREADS=1 -sPROXY_TO_PTHREAD=1 -sPTHREAD_POOL_SIZE_STRICT=0 -sFORCE_FILESYSTEM=1 -sWASMFS=1 -sEXIT_RUNTIME=1) set(SDL_PTHREADS ON CACHE BOOL "Enable SDL pthreads" FORCE) @@ -506,6 +505,7 @@ if (ISLE_BUILD_APP) ISLE/emscripten/messagebox.cpp ) target_compile_definitions(isle PRIVATE "ISLE_EMSCRIPTEN_HOST=\"${ISLE_EMSCRIPTEN_HOST}\"") + set_proprety(TARGET isle PROPERTY SUFFIX ".html") endif() endif() @@ -612,10 +612,18 @@ else() endif() set(ISLE_PACKAGE_NAME "${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}" CACHE STRING "Platform name of the package") -install(TARGETS isle lego1 ${install_extra_targets} +if(BUILD_SHARED_LIBS) + list(APPEND install_extra_targets lego1) +endif() +install(TARGETS isle ${install_extra_targets} RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" ) +if(EMSCRIPTEN) + install(FILES "$/isle.js" "$/isle.wasm" + DESTINATION "${CMAKE_INSTALL_BINDIR}" + ) +endif() set(CPACK_PACKAGE_DIRECTORY "dist") set(CPACK_PACKAGE_FILE_NAME "isle-${PROJECT_VERSION}-${ISLE_PACKAGE_NAME}-${CMAKE_SYSTEM_PROCESSOR}")