From 2d44804c3931b56f4518d8481675ef30f27186d1 Mon Sep 17 00:00:00 2001 From: Grok Compression Date: Tue, 4 Feb 2025 06:42:33 -0500 Subject: [PATCH] emscripten: use consistent compile and link options across project --- src/lib/core/CMakeLists.txt | 4 +++- thirdparty/liblcms2/CMakeLists.txt | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/lib/core/CMakeLists.txt b/src/lib/core/CMakeLists.txt index ef924410d..f6aebb0d0 100644 --- a/src/lib/core/CMakeLists.txt +++ b/src/lib/core/CMakeLists.txt @@ -148,8 +148,10 @@ add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/highway EXCLUDE_FROM_ALL) add_library(${GROK_CORE_NAME} ${GROK_LIBRARY_SRCS}) set_target_properties(${GROK_CORE_NAME} PROPERTIES ${GROK_LIBRARY_PROPERTIES}) target_compile_options(${GROK_CORE_NAME} PRIVATE ${GROK_COMPILE_OPTIONS} PRIVATE ${HWY_FLAGS}) +# set emcc options if (CMAKE_SYSTEM_NAME STREQUAL Emscripten) - target_compile_options(${GROK_CORE_NAME} PUBLIC -matomics) + target_link_options(${exe} PUBLIC -sASSERTIONS=1 -sPROXY_TO_PTHREAD -sTOTAL_MEMORY=1536MB -sEXIT_RUNTIME=1 -sUSE_PTHREADS=1) + target_compile_options(${exe} PUBLIC -matomics) endif() if (CMAKE_CXX_COMPILER_ID MATCHES "GNU") diff --git a/thirdparty/liblcms2/CMakeLists.txt b/thirdparty/liblcms2/CMakeLists.txt index 7c6f59318..d5d239b31 100644 --- a/thirdparty/liblcms2/CMakeLists.txt +++ b/thirdparty/liblcms2/CMakeLists.txt @@ -14,6 +14,7 @@ set_target_properties(${LIBTARGET} PROPERTIES OUTPUT_NAME "${LIBTARGET}") set_property(TARGET ${LIBTARGET} PROPERTY POSITION_INDEPENDENT_CODE ON) # set emcc options if (CMAKE_SYSTEM_NAME STREQUAL Emscripten) - target_compile_options(${LIBTARGET} PUBLIC -matomics) + target_link_options(${exe} PUBLIC -sASSERTIONS=1 -sPROXY_TO_PTHREAD -sTOTAL_MEMORY=1536MB -sEXIT_RUNTIME=1 -sUSE_PTHREADS=1) + target_compile_options(${exe} PUBLIC -matomics) endif()