Pyodide fixes

This commit is contained in:
Matthias Hochsteger 2025-01-31 13:06:44 +01:00
parent cf6c702d2c
commit 20196cd8e9

View File

@ -5,15 +5,13 @@ if(USE_OCC)
install(FILES nglib_occ.h DESTINATION ${NG_INSTALL_DIR_INCLUDE} COMPONENT netgen_devel) install(FILES nglib_occ.h DESTINATION ${NG_INSTALL_DIR_INCLUDE} COMPONENT netgen_devel)
endif(USE_OCC) endif(USE_OCC)
target_link_libraries(nglib PUBLIC ngcore PRIVATE ${ZLIB_LIBRARIES})
if(EMSCRIPTEN) if(EMSCRIPTEN)
target_compile_options(nglib PUBLIC $<BUILD_INTERFACE:$<TARGET_PROPERTY:ngcore,INTERFACE_COMPILE_OPTIONS>>)
target_compile_definitions(nglib PUBLIC $<TARGET_PROPERTY:ngcore,INTERFACE_COMPILE_DEFINITIONS>)
target_include_directories(nglib PUBLIC $<TARGET_PROPERTY:ngcore,INTERFACE_INCLUDE_DIRECTORIES>)
target_include_directories(nglib PRIVATE $<TARGET_PROPERTY:occ_libs,INTERFACE_INCLUDE_DIRECTORIES>) target_include_directories(nglib PRIVATE $<TARGET_PROPERTY:occ_libs,INTERFACE_INCLUDE_DIRECTORIES>)
target_link_libraries(nglib PRIVATE ${ZLIB_LIBRARIES} $<BUILD_INTERFACE:$<TARGET_PROPERTY:occ_libs,INTERFACE_LINK_LIBRARIES>>) target_link_libraries(nglib PRIVATE $<BUILD_INTERFACE:$<TARGET_PROPERTY:occ_libs,INTERFACE_LINK_LIBRARIES>>)
else(EMSCRIPTEN) else(EMSCRIPTEN)
target_link_libraries(nglib PUBLIC ngcore) target_link_libraries( nglib PRIVATE ${CMAKE_THREAD_LIBS_INIT} ${JPEG_LIBRARIES} ${MKL_LIBRARIES} occ_libs netgen_cgns )
target_link_libraries( nglib PRIVATE ${CMAKE_THREAD_LIBS_INIT} ${JPEG_LIBRARIES} ${MKL_LIBRARIES} ${ZLIB_LIBRARIES} occ_libs netgen_cgns )
endif(EMSCRIPTEN) endif(EMSCRIPTEN)
install(TARGETS nglib netgen_cgns ${NG_INSTALL_DIR}) install(TARGETS nglib netgen_cgns ${NG_INSTALL_DIR})