From 57c000118ac198ec778b7f40ea3c6ca4ac0ead13 Mon Sep 17 00:00:00 2001 From: Bart Janssens Date: Fri, 21 Jun 2024 23:58:14 +0200 Subject: [PATCH] Fix link error on MSVC Issue #166 --- .github/workflows/test-linux-mac.yml | 2 +- .github/workflows/test-win.yml | 6 +++--- src/jlcxx.cpp | 4 ++++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test-linux-mac.yml b/.github/workflows/test-linux-mac.yml index fb36a63..fe243f9 100644 --- a/.github/workflows/test-linux-mac.yml +++ b/.github/workflows/test-linux-mac.yml @@ -43,7 +43,7 @@ jobs: body: ${{ github.event.pull_request.body }} run: | package="$(echo "$body" | sed -n '1p')" - if [ -z "${package}" ]; then + if [[ "$package" != "http"* ]]; then package="https://github.com/JuliaInterop/CxxWrap.jl.git" fi if [[ "$OSTYPE" != "darwin"* ]]; then diff --git a/.github/workflows/test-win.yml b/.github/workflows/test-win.yml index 3fa3272..9c6d04d 100644 --- a/.github/workflows/test-win.yml +++ b/.github/workflows/test-win.yml @@ -40,10 +40,10 @@ jobs: cd build cmake -G "Visual Studio 17 2022" -A x64 -DOVERRIDES_PATH=$HOMEDRIVE/$HOMEPATH/.julia/artifacts/Overrides.toml -DOVERRIDE_ROOT=./ -DAPPEND_OVERRIDES_TOML=ON .. package="$(echo "$body" | sed -n '1p')" - if [ -z "${package}" ]; then + if [[ "$package" != "http"* ]]; then package="https://github.com/JuliaInterop/CxxWrap.jl.git" fi - cmake --build . --config Release + cmake --build . --config Debug julia -e "using Pkg; Pkg.Registry.add(\"General\"); Pkg.Registry.add(RegistrySpec(url = \"https://github.com/barche/CxxWrapTestRegistry.git\"))" julia -e "using Pkg; pkg\"add ${package}\"; using CxxWrap" - ctest -j 1 -C Release -V + ctest -j 1 -C Debug -V diff --git a/src/jlcxx.cpp b/src/jlcxx.cpp index f52ee86..451f0a3 100644 --- a/src/jlcxx.cpp +++ b/src/jlcxx.cpp @@ -339,6 +339,10 @@ namespace detail { } }; + + template struct JLCXX_API BasicArg; + template struct JLCXX_API BasicArg; + } #ifdef JLCXX_USE_TYPE_MAP