cmake changes (#1048)

* enable emscripten build with tbb enabled * nix: fix emscripten build, add tbb build * browser * fix python build * minor * no parallel sdf for js * disable test for emscripten-tbb * add cache for nix python build * cmake changes * fix * update * update * update * update * move python dependency handling * more changes * format * fix broken format * fix * simplify * allow emscripten with cbind * build fetched dependencies as static libs * fix static build * fix rebuild * fix extras * remove parallel.h from public API * update tests * make dependencies private * move parallel.h * missing utils.h change * fix * fix... * fix wasm tbb * add more cmake consumer tests * fix consumer * add rpath * Revert "add rpath" This reverts commit 2e8a96c. * rpath specific to macos * use override * forgot to set rpath... * remove #1045 related changes * integrate #1052 * allow version override * minor improvements * msvc changes * fix typo --------- Co-authored-by: Emmett Lalish <[email protected]>
elalish · Nov 17, 2024 · 7f298aa · 7f298aa
1 parent 1810105
commit 7f298aa
Show file tree

Hide file tree

Showing 45 changed files with 948 additions and 685 deletions.
diff --git a/.github/workflows/manifold.yml b/.github/workflows/manifold.yml
@@ -213,7 +213,7 @@ jobs:
         pip install trimesh pytest
     - name: Install TBB
       if: matrix.parallelization == 'ON'
-      run: brew install tbb onedpl
+      run: brew install tbb
     - uses: actions/checkout@v4
     - uses: jwlawson/actions-setup-cmake@v2
     - name: Build
@@ -232,24 +232,60 @@ jobs:
         sudo cmake --install .
         cd ..
         ./scripts/test-cmake.sh
+        LDFLAGS=-Wl,-rpath,/usr/local/lib ./scripts/test-pkgconfig.sh
 
-  build_nix:
+  build_mac_builtin_tbb:
     timeout-minutes: 30
-    strategy:
-      matrix:
-        # variant: [none, tbb, js]
-        # disabling js variant for now
-        variant: [none, tbb]
-    runs-on: ubuntu-latest
+    runs-on: macos-latest
+    steps:
+    - name: Install common dependencies
+      run: |
+        brew install pkg-config googletest
+        pip install trimesh pytest
+    - uses: actions/checkout@v4
+    - uses: jwlawson/actions-setup-cmake@v2
+    - name: Build
+      run: |
+        mkdir build
+        cd build
+        cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DMANIFOLD_DEBUG=ON -DMANIFOLD_PYBIND=OFF -DMANIFOLD_PAR=ON .. && make
+    - name: Test
+      run: |
+        cd build/test
+        ./manifold_test
+        cd ../../
+    - name: test cmake consumer
+      run: |
+        cd build
+        sudo cmake --install .
+        cd ..
+        ./scripts/test-cmake.sh
+        LDFLAGS=-Wl,-rpath,/usr/local/lib ./scripts/test-pkgconfig.sh
+
+  build_mac_builtin_tbb_subdir:
+    timeout-minutes: 30
+    runs-on: macos-latest
     steps:
+    - name: Install common dependencies
+      run: |
+        brew install pkg-config googletest
+        pip install trimesh pytest
     - uses: actions/checkout@v4
-    - uses: cachix/install-nix-action@v22
-    - run: nix build -L '.?submodules=1#manifold-${{matrix.variant}}'
+    - uses: jwlawson/actions-setup-cmake@v2
+    - name: test cmake consumer
+      run: |
+        cd ..
+        ./manifold/scripts/test-cmake-subdir.sh
 
-  build_nix_python:
+  build_nix:
     timeout-minutes: 30
+    strategy:
+      matrix:
+        variant: [manifold-none, manifold-tbb, manifold-js, manifold3d]
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - uses: cachix/install-nix-action@v22
-    - run: nix build -L '.?submodules=1#manifold3d'
+    - uses: DeterminateSystems/nix-installer-action@main
+    - uses: DeterminateSystems/magic-nix-cache-action@main
+    - run: nix build -L '.?submodules=1#${{matrix.variant}}'
+