From 96bad51dd39b16a29a1315b317071aa4d1439019 Mon Sep 17 00:00:00 2001
From: Matthias Hochsteger <mhochsteger@cerbsim.com>
Date: Mon, 7 Oct 2024 18:04:20 +0200
Subject: [PATCH] Pyodide fixes

---
 cmake/SuperBuild.cmake | 2 +-
 nglib/CMakeLists.txt   | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/cmake/SuperBuild.cmake b/cmake/SuperBuild.cmake
index b55bfb93..595bfb3b 100644
--- a/cmake/SuperBuild.cmake
+++ b/cmake/SuperBuild.cmake
@@ -152,7 +152,7 @@ if(BUILD_ZLIB)
     set(ZLIB_INCLUDE_DIRS ${ZLIB_ROOT}/include)
     set(ZLIB_LIBRARIES ${ZLIB_ROOT}/lib/zlibstatic.lib)
     set(ZLIB_LIBRARY_RELEASE ${ZLIB_ROOT}/lib/zlibstatic.lib)
-  elseif(WIN32)
+  else(WIN32)
     set(ZLIB_INCLUDE_DIRS ${ZLIB_ROOT}/include)
     set(ZLIB_LIBRARIES ${ZLIB_ROOT}/lib/libz.a)
     set(ZLIB_LIBRARY_RELEASE ${ZLIB_ROOT}/lib/libz.a)
diff --git a/nglib/CMakeLists.txt b/nglib/CMakeLists.txt
index aa9c101b..47eb6597 100644
--- a/nglib/CMakeLists.txt
+++ b/nglib/CMakeLists.txt
@@ -9,6 +9,8 @@ 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_link_libraries(nglib PRIVATE ${ZLIB_LIBRARIES} $<BUILD_INTERFACE:$<TARGET_PROPERTY:occ_libs,INTERFACE_LINK_LIBRARIES>>)
 else(EMSCRIPTEN)
   target_link_libraries(nglib PUBLIC ngcore)
   target_link_libraries( nglib PRIVATE ${CMAKE_THREAD_LIBS_INIT} ${JPEG_LIBRARIES} ${MKL_LIBRARIES} ${ZLIB_LIBRARIES} occ_libs netgen_cgns )