Save FreeCAD WebAssembly development state
Some checks failed
FreeCAD master CI / Prepare (push) Has been cancelled
FreeCAD master CI / Pixi (push) Has been cancelled
FreeCAD master CI / Ubuntu (push) Has been cancelled
FreeCAD master CI / Windows (push) Has been cancelled
FreeCAD master CI / Lint (push) Has been cancelled
FreeCAD master CI / WrapUp (push) Has been cancelled
CodeQL Advanced / Analyze (actions) (push) Has been cancelled
CodeQL Advanced / Analyze (python) (push) Has been cancelled
Scorecard supply-chain security / Scorecard analysis (push) Has been cancelled
Some checks failed
FreeCAD master CI / Prepare (push) Has been cancelled
FreeCAD master CI / Pixi (push) Has been cancelled
FreeCAD master CI / Ubuntu (push) Has been cancelled
FreeCAD master CI / Windows (push) Has been cancelled
FreeCAD master CI / Lint (push) Has been cancelled
FreeCAD master CI / WrapUp (push) Has been cancelled
CodeQL Advanced / Analyze (actions) (push) Has been cancelled
CodeQL Advanced / Analyze (python) (push) Has been cancelled
Scorecard supply-chain security / Scorecard analysis (push) Has been cancelled
This commit is contained in:
@@ -1,10 +1,13 @@
|
||||
# -------------------------------- Qt --------------------------------
|
||||
|
||||
set(FREECAD_QT_COMPONENTS Core Concurrent Network Xml)
|
||||
if(FREECAD_WEB)
|
||||
if(FREECAD_WEB AND NOT FREECAD_WEB_ENABLE_TECHDRAW_NATIVE)
|
||||
# QtConcurrent is only used by GUI code in the current Web module graph.
|
||||
set(FREECAD_QT_COMPONENTS Core Network Xml)
|
||||
endif()
|
||||
if(FREECAD_WEB AND FREECAD_WEB_ENABLE_TECHDRAW_NATIVE)
|
||||
list(APPEND FREECAD_QT_COMPONENTS Gui Widgets)
|
||||
endif()
|
||||
if (FREECAD_QT_MAJOR_VERSION EQUAL 6)
|
||||
set (Qt6Core_MOC_EXECUTABLE Qt6::moc)
|
||||
endif()
|
||||
|
||||
@@ -92,7 +92,15 @@ macro(SetupSalomeSMESH)
|
||||
if(NOT FREECAD_USE_EXTERNAL_SMESH)
|
||||
find_package(MEDFile REQUIRED)
|
||||
# See https://www.hdfgroup.org/HDF5/release/cmakebuild.html
|
||||
if (MSVC)
|
||||
if (CMAKE_SYSTEM_NAME STREQUAL "Emscripten" AND HDF5_WASM_INCLUDE_DIRS AND HDF5_WASM_LIBRARIES)
|
||||
# The host pkg-config database must not participate in the
|
||||
# browser closure. MEDFile and SMESH consume the same
|
||||
# Emscripten-built HDF5 archives used by VTK.
|
||||
set(HDF5_INCLUDE_DIRS ${HDF5_WASM_INCLUDE_DIRS})
|
||||
set(HDF5_LIBRARIES ${HDF5_WASM_LIBRARIES})
|
||||
include_directories(${HDF5_WASM_INCLUDE_DIRS})
|
||||
link_libraries(${HDF5_WASM_LIBRARIES})
|
||||
elseif (MSVC)
|
||||
find_package(HDF5 COMPONENTS NO_MODULE REQUIRED static)
|
||||
else()
|
||||
find_package(PkgConfig)
|
||||
|
||||
Reference in New Issue
Block a user