Skip to content

Dokken/update cmake #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danielepanozzo merged 18 commits into from
Dec 16, 2024
Merged

Dokken/update cmake #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
5427711
Bump *wild dependencies
jorgensd Dec 12, 2024
037554a
Try to update build scripts
jorgensd Dec 12, 2024
581ef9e
Try removing fetch
jorgensd Dec 12, 2024
7d92126
Release the hounds (windows)
jorgensd Dec 12, 2024
378429d
Bump macos
jorgensd Dec 12, 2024
c92efa4
go back to old commit hash
MariusCausemann Dec 12, 2024
a241048
bump mac-os13 and fix vc++ to 16.XX
MariusCausemann Dec 12, 2024
271516c
vc++ 14.00
MariusCausemann Dec 12, 2024
40df602
Update continuous.yml
MariusCausemann Dec 12, 2024
a3b457d
Update continuous.yml
MariusCausemann Dec 12, 2024
e7333a2
Apply suggestions from code review
jorgensd Dec 12, 2024
e134ca6
Too fast, too furious
jorgensd Dec 12, 2024
2f10489
Update continuous.yml
MariusCausemann Dec 12, 2024
ec7ef7d
Update continuous.yml
MariusCausemann Dec 12, 2024
b1be23a
disable debug
MariusCausemann Dec 13, 2024
811113f
bump pybind
MariusCausemann Dec 15, 2024
48c5e9d
bump python to 3.7
MariusCausemann Dec 15, 2024
de49d07
enable debug
MariusCausemann Dec 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 20 additions & 10 deletions .github/workflows/continuous.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,29 @@ env:
CTEST_OUTPUT_ON_FAILURE: ON
CTEST_PARALLEL_LEVEL: 2

defaults:
run:
shell: bash -el {0}

jobs:
Build:
name: ${{ matrix.name }} (${{ matrix.config }})
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [ubuntu-18.04, macos-latest, windows-2019]
os: [ubuntu-22.04, macOS-13, windows-2019]
config: [Debug, Release]
include:
- os: ubuntu-18.04
- os: ubuntu-22.04
name: Linux
- os: windows-2019
name: Windows
- os: macos-latest
- os: macos-13
name: macOS
steps:
- name: Checkout repository
uses: actions/checkout@v1
uses: actions/checkout@v4
with:
fetch-depth: 10
submodules: "recursive"
Expand All @@ -39,14 +43,16 @@ jobs:
if: runner.os == 'Windows'
uses: ilammy/msvc-dev-cmd@v1

- name: Stetup Conda
uses: s-weigand/setup-conda@v1
- name: Setup Conda
uses: conda-incubator/setup-miniconda@v3
with:
conda-channels: anaconda, conda-forge
python-version: 3.6
channels: conda-forge
python-version: 3.7
channel-priority: true
activate-environment: test-env

- name: Install Dependencies
run: conda install numpy svgwrite -y
run: conda install numpy svgwrite cmake git -y

- name: Install Dependencies (Windows)
if: runner.os == 'Windows'
Expand All @@ -56,9 +62,13 @@ jobs:
if: runner.os == 'Windows'
run: echo "CMAKE_GENERATOR=NMake Makefiles" >> $GITHUB_ENV

- name: Configure git
run: git config --global http.version HTTP/1.1

- name: Build (Debug)
if: matrix.config == 'Debug'
run: python setup.py build --debug install
run: |
python setup.py build --debug install

- name: Build (Release)
if: matrix.config == 'Release'
Expand Down
7 changes: 3 additions & 4 deletions cmake/WildMeshingDownloadExternal.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,10 @@ endfunction()

################################################################################


function(wildmeshing_download_triwild)
wildmeshing_download_project(triwild
GIT_REPOSITORY https://github.com/wildmeshing/TriWild
GIT_TAG 8e9e5ea25b11b346ddb8db8746174153259807d4
GIT_TAG ac7977c1da9fb25de8c0f7c666055e6d09034686
)
endfunction()

Expand All @@ -41,14 +40,14 @@ endfunction()
function(wildmeshing_download_pybind11)
wildmeshing_download_project(pybind11
GIT_REPOSITORY https://github.com/pybind/pybind11
GIT_TAG 085a29436a8c472caaaf7157aa644b571079bcaa
GIT_TAG a2e59f0e7065404b44dfe92a28aca47ba1378dc4
)
endfunction()

# data
function(wildmeshing_download_data)
wildmeshing_download_project(data
GIT_REPOSITORY https://github.com/wildmeshing/data
GIT_TAG 1484054abbac36e9c8340c3b32d87ad6eee45016
GIT_TAG 363f8e860673a4e4f68df6465b99e86809c96283
)
endfunction()
Loading