Merge branch 'jhale/windows-build' of github.com:FEniCS/basix into jh…

…ale/windows-build
FEniCS · Apr 28, 2024 · 2206398 · 2206398
2 parents e037ecb + 1a4143b
commit 2206398
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -19,7 +19,7 @@ jobs:
     name: Build and test (Windows)
     runs-on: windows-2022
     env:
-      CMAKE_ARGS: -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DBasix_DIR=D:/a/basix/install
+      CMAKE_ARGS: -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DBasix_DIR=D:/a/basix/install/lib/cmake/basix
       VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
 
     steps:
@@ -40,9 +40,9 @@ jobs:
       - name: Install Basix C++ library
         run: |
           cd cpp
-          cmake -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -B build-dir -S . # Use make (not ninja)
-          cmake --build build-dir --config Debug
-          cmake --install build-dir --config Debug --prefix D:/a/basix/install
+          cmake -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON -B build-dir -S . # Use make (not ninja)
+          cmake --build build-dir --config Release
+          cmake --install build-dir --config Release --prefix D:/a/basix/install
       - name: Install Basix Python wrapper
         run: |
           cd python

diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
@@ -31,7 +31,7 @@ find_package(LAPACK REQUIRED)
 feature_summary(WHAT ALL)
 
 # Source files
-add_library(basix)
+add_library(basix SHARED)
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/basix/version.h.in basix/version.h)
 include_directories(${CMAKE_CURRENT_BINARY_DIR})