Skip to content

cmake: minor updates #13980

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
rmcdermo merged 3 commits into from
Jan 5, 2025
Merged

cmake: minor updates #13980

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d07f923
ci: use ubuntu-24.04
JakeOShannessy Jan 4, 2025
91cdc97
cmake: use latest hyper
Jan 4, 2025
8f935db
add CMakePresets.json
Jan 4, 2025
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
4 changes: 2 additions & 2 deletions .github/workflows/cmake.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ permissions:
jobs:
cmake-linux:
name: ${{ matrix.container }} ${{ matrix.compiler_mpi }} openmp=${{ matrix.openmp }} ${{ matrix.build_type }}
runs-on: [ubuntu-latest]
runs-on: [ubuntu-24.04]
container: ${{ matrix.container }}
strategy:
matrix:
Expand Down Expand Up @@ -271,7 +271,7 @@ jobs:
- name: build fds
run: |
call Build\Scripts\setup_intel_compilers.bat
cmake -B builddir -S . -G Ninja -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DUSE_SUNDIALS=OFF -DUSE_HYPRE=ON -DHYPRE_FMANGLE=4 -DUSE_OPENMP=${{matrix.openmp}}
cmake -B builddir -S . -G Ninja -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DUSE_SUNDIALS=OFF -DUSE_HYPRE=ON -DUSE_OPENMP=${{matrix.openmp}}
cmake --build builddir -j --target fds

- name: Test
Expand Down
5 changes: 5 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,3 +99,8 @@ Validation/*/FDS_Output_Files/*.csv

# Verification script generated fds files
Verification/Timing_Benchmarks/t*.fds

# Local cmake configuration
CMakeUserPresets.json
Build/cmakeb/
.vscode/
11 changes: 6 additions & 5 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,16 +151,17 @@ if(USE_HYPRE)
set(HYPRE_GIT_VERSION "2.32.0" )
FetchContent_Declare(
HYPRE
# GIT_REPOSITORY https://github.com/hypre-space/hypre.git
# GIT_TAG b6d8c3085af64988f8f8bc21b7aef12ab49c5430 # v${HYPRE_GIT_VERSION}

GIT_REPOSITORY https://github.com/hypre-space/hypre.git
# Currently we need to refer directly to a commit which contains a
# patch to handle HYPRE_FMANGLE
GIT_REPOSITORY https://github.com/JakeOShannessy/hypre.git
GIT_TAG b6d8c3085af64988f8f8bc21b7aef12ab49c5430 # v2.32.0
GIT_TAG 6d01417697aa84d118eb1e1eb91315df42575be5 # v${HYPRE_GIT_VERSION}
SOURCE_SUBDIR src
OVERRIDE_FIND_PACKAGE
)
# Set some options for building hypre
if (WIN32)
set(HYPRE_ENABLE_FMANGLE CAPS)
endif()
FetchContent_MakeAvailable(HYPRE)
endif()

Expand Down
Loading
Loading