Merge branch 'master' of https://github.com/MeshInspector/MeshLib into dev

Author: alpinebuster

CMakeLists.txt

@@ -16,6 +16,9 @@ set(MESHLIB_PROJECT_NAME "MeshLib" CACHE STRING "Project name")
 add_compile_definitions(MR_PROJECT_NAME=\"${MESHLIB_PROJECT_NAME}\")
 
 include(CompilerOptions)
+IF(EMSCRIPTEN)
+  include(ConfigureEmscripten)
+ENDIF()
 
 # all binaries will be located in ./build/Release/bin
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
@@ -169,9 +172,6 @@ IF(NOT MR_EMSCRIPTEN)
   find_package(fmt)
   find_package(spdlog REQUIRED)
   find_package(TBB REQUIRED)
-  IF(spdlog_VERSION VERSION_GREATER_EQUAL "1.7" AND fmt_VERSION VERSION_GREATER_EQUAL "7.0")
-    add_compile_definitions(SPDLOG_FMT_EXTERNAL)
-  ENDIF()
   add_compile_definitions(SPDLOG_COMPILED_LIB SPDLOG_SHARED_LIB)
 ENDIF() # NOT MR_EMSCRIPTEN
 
@@ -354,6 +354,10 @@ install(
   DESTINATION ${MR_CONFIG_DIR}
 )
 
+IF(EMSCRIPTEN)
+  install(FILES cmake/Modules/EmscriptenHelpers.cmake DESTINATION ${MR_CONFIG_DIR})
+ENDIF()
+
 IF(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
   set(CPACK_GENERATOR "DRAGNDROP")
   include(CPack)

cmake/Modules/CompilerOptions.cmake

@@ -96,9 +96,9 @@ IF(WIN32)
   ENDIF()
 ENDIF()
 
-IF(NOT MR_EMSCRIPTEN_SINGLETHREAD AND NOT MSVC)
+IF(NOT EMSCRIPTEN AND NOT MSVC)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
-ENDIF() # NOT MR_EMSCRIPTEN_SINGLETHREAD
+ENDIF()
 
 IF(MSVC)
   add_definitions(-DUNICODE -D_UNICODE)
@@ -152,55 +152,9 @@ add_compile_definitions(PYBIND11_NONLIMITEDAPI_LIB_SUFFIX_FOR_MODULE=\"${MESHLIB
 IF(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 12 AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 13)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wabi=16")
 ENDIF()
-# complitely ignore "maybe-uninitialized" for GCC because of false positives
+# completely ignore "maybe-uninitialized" for GCC because of false positives
 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=109561
 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=116090
 IF(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-maybe-uninitialized")
 ENDIF()
-
-
-IF(MR_EMSCRIPTEN)
-  # reference: https://github.com/emscripten-core/emscripten/blob/main/src/settings.js
-  string(JOIN " " CMAKE_EXE_LINKER_FLAGS
-    "${CMAKE_EXE_LINKER_FLAGS}"
-    "-s EXPORTED_RUNTIME_METHODS=[ccall]"
-    "-s ALLOW_MEMORY_GROWTH=1"
-    "-s LLD_REPORT_UNDEFINED=1"
-    "-s USE_WEBGL2=1"
-    "-s USE_GLFW=3"
-    "-s USE_ZLIB=1"
-    "-s FULL_ES3=1"
-    "-s USE_LIBPNG=1"
-  )
-
-  IF(MR_EMSCRIPTEN_SINGLETHREAD)
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s ENVIRONMENT=web,node")
-  ELSE()
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s ENVIRONMENT=web,worker,node -pthread -s PTHREAD_POOL_SIZE_STRICT=0 -s PTHREAD_POOL_SIZE=navigator.hardwareConcurrency")
-
-    # uncomment to enable source map for debugging in browsers (slow)
-    #set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -gsource-map")
-
-    # REF: `https://emscripten.org/docs/tools_reference/settings_reference.html#maximum-memory`,
-    # `https://github.com/emscripten-core/emscripten/issues/22794#issuecomment-2445501403`
-    IF(MR_EMSCRIPTEN_WASM64)
-      set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s MAXIMUM_MEMORY=16GB") # wasm-ld: maximum memory [...] cannot be greater than 17179869184
-    ELSE()
-      set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s MAXIMUM_MEMORY=4GB")
-    ENDIF()
-
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-pthreads-mem-growth") # look https://github.com/emscripten-core/emscripten/issues/8287
-  ENDIF() # NOT MR_EMSCRIPTEN_SINGLETHREAD
-
-  IF(NOT MR_DISABLE_EMSCRIPTEN_ASYNCIFY)
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s ASYNCIFY -Wno-limited-postlink-optimizations")
-    add_compile_definitions(MR_EMSCRIPTEN_ASYNCIFY)
-  ENDIF() # NOT MR_DISABLE_EMSCRIPTEN_ASYNCIFY
-
-  add_compile_definitions(SPDLOG_FMT_EXTERNAL)
-  add_compile_definitions(SPDLOG_WCHAR_FILENAMES) # hack to make it work with new version of fmt
-
-  # FIXME: comment required
-  add_compile_definitions(EIGEN_STACK_ALLOCATION_LIMIT=0)
-ENDIF() # MR_EMSCRIPTEN

cmake/Modules/ConfigureEmscripten.cmake

@@ -0,0 +1,54 @@
+# reference: https://github.com/emscripten-core/emscripten/blob/main/src/settings.js
+string(JOIN " " MESHLIB_EMSCRIPTEN_CXX_FLAGS
+  "--use-port=boost_headers"
+  "--use-port=freetype" # TODO: make optional
+  "--use-port=libpng" # TODO: make optional
+  "--use-port=zlib" # TODO: make optional
+)
+string(JOIN " " MESHLIB_EMSCRIPTEN_EXE_LINKER_FLAGS
+  "-s EXPORTED_RUNTIME_METHODS=[ccall]"
+  "-s ALLOW_MEMORY_GROWTH=1"
+  "-s LLD_REPORT_UNDEFINED=1"
+  "-s USE_WEBGL2=1"
+  "-s USE_GLFW=3"
+  "-s FULL_ES3=1"
+)
+
+IF(MR_EMSCRIPTEN_SINGLETHREAD)
+  set(MESHLIB_EMSCRIPTEN_EXE_LINKER_FLAGS "${MESHLIB_EMSCRIPTEN_EXE_LINKER_FLAGS} -s ENVIRONMENT=web,node")
+ELSE()
+  string(JOIN " " MESHLIB_EMSCRIPTEN_CXX_FLAGS ${MESHLIB_EMSCRIPTEN_CXX_FLAGS}
+    "-pthread"
+    # look https://github.com/emscripten-core/emscripten/issues/8287
+    "-Wno-pthreads-mem-growth"
+  )
+
+  # uncomment to enable source map for debugging in browsers (slow)
+  #set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -gsource-map")
+
+  IF(MR_EMSCRIPTEN_WASM64)
+    set(MAXIMUM_MEMORY 16GB) # wasm-ld: maximum memory [...] cannot be greater than 17179869184
+  ELSE()
+    set(MAXIMUM_MEMORY 4GB)
+  ENDIF()
+  string(JOIN " " MESHLIB_EMSCRIPTEN_EXE_LINKER_FLAGS ${MESHLIB_EMSCRIPTEN_EXE_LINKER_FLAGS}
+    "-s ENVIRONMENT=web,worker,node"
+    #"-pthread"
+    "-s PTHREAD_POOL_SIZE_STRICT=0"
+    "-s PTHREAD_POOL_SIZE=navigator.hardwareConcurrency"
+    "-s MAXIMUM_MEMORY=${MAXIMUM_MEMORY}"
+  )
+ENDIF()
+
+IF(NOT MR_DISABLE_EMSCRIPTEN_ASYNCIFY)
+  string(JOIN " " MESHLIB_EMSCRIPTEN_EXE_LINKER_FLAGS ${MESHLIB_EMSCRIPTEN_EXE_LINKER_FLAGS}
+    "-s ASYNCIFY"
+    # FIXME: comment required
+    "-Wno-limited-postlink-optimizations"
+  )
+
+  add_compile_definitions(MR_EMSCRIPTEN_ASYNCIFY)
+ENDIF()
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MESHLIB_EMSCRIPTEN_CXX_FLAGS}")
+set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${MESHLIB_EMSCRIPTEN_EXE_LINKER_FLAGS}")