From a3e3e4248c00307beadcce19300350f93260921f Mon Sep 17 00:00:00 2001
From: samhza <sam@samhza.com>
Date: Thu, 3 Nov 2022 17:48:51 -0400
Subject: [PATCH] fix mac build (#324)

* only run docs CI when docs change

* remove broken windows CI, fix mac build
---
 .github/workflows/build.yml  | 33 ++++++---------------------------
 .github/workflows/mkdocs.yml |  4 +++-
 CMakeLists.txt               |  4 ++--
 3 files changed, 11 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 78a7b88..242c595 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -26,36 +26,15 @@ jobs:
     - name: Build
       run: pnpm install --config.strict-peer-dependencies=false && pnpm run build
 
-  win64:
-    runs-on: windows-2019
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v1
-    - name: Setup Scoop
-      uses: MinoruSekine/setup-scoop@v1
-    - name: Setup Node.js environment
-      uses: actions/setup-node@v2.1.2
-    - name: Setup pnpm
-      uses: pnpm/action-setup@v2.2.2
-      with:
-        version: 7
-    - name: Install Dependencies
-      run: scoop install libvips imagemagick
-    - name: Build
-      run: $PNPM_HOME/pnpm install --config.strict-peer-dependencies=false && $PNPM_HOME/pnpm run build
-
   darwin:
     runs-on: macos-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@v1
-    - name: Setup Node.js environment
-      uses: actions/setup-node@v2.1.2
-    - name: Setup pnpm
-      uses: pnpm/action-setup@v2.2.2
-      with:
-        version: 7
+      uses: actions/checkout@v2
     - name: Install dependencies
-      run: brew install imagemagick vips
+      run: |
+        brew install imagemagick vips node pnpm npm
+        pnpm install --config.strict-peer-dependencies=false
     - name: Build
-      run: pnpm install --config.strict-peer-dependencies=false && pnpm run build
+      run: pnpm run build
+
diff --git a/.github/workflows/mkdocs.yml b/.github/workflows/mkdocs.yml
index 6943d3c..10f7bc5 100644
--- a/.github/workflows/mkdocs.yml
+++ b/.github/workflows/mkdocs.yml
@@ -3,6 +3,8 @@ on:
   push:
     branches:
       - master
+    paths:
+      - 'docs/**'
 
 jobs:
   build:
@@ -16,4 +18,4 @@ jobs:
         uses: mhausenblas/mkdocs-deploy-gh-pages@master
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          REQUIREMENTS: docs/requirements.txt
\ No newline at end of file
+          REQUIREMENTS: docs/requirements.txt
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3ba2bee..8617eba 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,9 +29,9 @@ target_link_libraries(${PROJECT_NAME} ${ImageMagick_LIBRARIES})
 pkg_check_modules(VIPS REQUIRED vips-cpp)
 include_directories(${VIPS_INCLUDE_DIRS})
 link_directories(${VIPS_LIBRARY_DIRS})
-target_link_libraries(${PROJECT_NAME} ${VIPS_LIBRARIES})
+target_link_libraries(${PROJECT_NAME} ${VIPS_LDFLAGS})
 
 if(MSVC AND CMAKE_JS_NODELIB_DEF AND CMAKE_JS_NODELIB_TARGET)
   # Generate node.lib
   execute_process(COMMAND ${CMAKE_AR} /def:${CMAKE_JS_NODELIB_DEF} /out:${CMAKE_JS_NODELIB_TARGET} ${CMAKE_STATIC_LINKER_FLAGS})
-endif()
\ No newline at end of file
+endif()