diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a1ee1445..6fa818c3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -79,7 +79,13 @@ jobs: run: | curl -# -L -o eigen.tar.bz2 https://gitlab.com/libeigen/eigen/-/archive/3.4.0/eigen-3.4.0.tar.bz2 tar jxvf eigen.tar.bz2 - cmake eigen-3.4.0 + mkdir ebuild + mkdir eigen + pushd ebuild + cmake ../eigen-3.4.0 -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/eigen + make + make install + popd - run: ${{ github.workspace }}/scripts/windows-install/buildLibrecadAndCreatePackage.bat diff --git a/scripts/windows-install/buildLibrecadAndCreatePackage.bat b/scripts/windows-install/buildLibrecadAndCreatePackage.bat index 3df55f5d..d8282a28 100755 --- a/scripts/windows-install/buildLibrecadAndCreatePackage.bat +++ b/scripts/windows-install/buildLibrecadAndCreatePackage.bat @@ -8,7 +8,7 @@ cat Eigen3Config.cmake cmake -S %cd% -B %cd%\out\build\windows-default ^ -DCMAKE_TOOLCHAIN_FILE=conan_toolchain.cmake ^ -DCMAKE_BUILD_TYPE=RelWithDebInfo ^ --DEigen3_DIR=%cd% ^ +-DCMAKE_PREFIX_PATH=%cd%\ebuild ^ --install-prefix %cd%\installprefix cd out\build\windows-default