Skip to content

Make vendor subdirectories SYSTEM #123

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
tpadioleau merged 1 commit into from
Sep 10, 2025
Merged

Make vendor subdirectories SYSTEM #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .github/workflows/tests-macos.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ jobs:
- name: Build Heracles++
run: |
. $PDI_ROOT/share/pdi/env.sh
cmake -DBUILD_TESTING=ON -DNovapp_BUILD_BENCHMARKING=OFF -DNovapp_NDIM=3 -DNovapp_SETUP=advection_sinus -DNovapp_EOS=PerfectGas -DNovapp_GEOM=Cartesian -DNovapp_GRAVITY=Uniform -DNovapp_benchmark_DEPENDENCY_POLICY=INSTALLED -DNovapp_GTest_DEPENDENCY_POLICY=INSTALLED -DNovapp_inih_DEPENDENCY_POLICY=INSTALLED -DNovapp_Kokkos_DEPENDENCY_POLICY=INSTALLED -B build
cmake -DBUILD_TESTING=ON -DNovapp_BUILD_BENCHMARKING=ON -DNovapp_NDIM=3 -DNovapp_SETUP=advection_sinus -DNovapp_EOS=PerfectGas -DNovapp_GEOM=Cartesian -DNovapp_GRAVITY=Uniform -DNovapp_benchmark_DEPENDENCY_POLICY=INSTALLED -DNovapp_GTest_DEPENDENCY_POLICY=INSTALLED -DNovapp_inih_DEPENDENCY_POLICY=INSTALLED -DNovapp_Kokkos_DEPENDENCY_POLICY=INSTALLED -B build
cmake --build build
ctest --test-dir build --output-on-failure --timeout 5 --output-junit tests.xml
./build/benchmarks/benchmarks --benchmark_dry_run=true
Expand Down
10 changes: 5 additions & 5 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# SPDX-License-Identifier: MIT

cmake_minimum_required(VERSION 3.20)
cmake_minimum_required(VERSION 3.25)

project(Nova++ LANGUAGES CXX)

Expand Down Expand Up @@ -90,7 +90,7 @@ set_property(
PROPERTY STRINGS "${Novapp_DEPENDENCY_POLICIES}"
)
if("${Novapp_benchmark_DEPENDENCY_POLICY}" STREQUAL "EMBEDDED")
add_subdirectory(vendor/benchmark)
add_subdirectory(vendor/benchmark SYSTEM)
elseif("${Novapp_benchmark_DEPENDENCY_POLICY}" STREQUAL "INSTALLED")
find_package(benchmark REQUIRED)
endif()
Expand All @@ -109,7 +109,7 @@ set_property(
PROPERTY STRINGS "${Novapp_DEPENDENCY_POLICIES}"
)
if("${Novapp_GTest_DEPENDENCY_POLICY}" STREQUAL "EMBEDDED")
add_subdirectory(vendor/googletest)
add_subdirectory(vendor/googletest SYSTEM)
elseif("${Novapp_GTest_DEPENDENCY_POLICY}" STREQUAL "INSTALLED")
find_package(GTest REQUIRED CONFIG)
endif()
Expand All @@ -122,7 +122,7 @@ set(Novapp_inih_DEPENDENCY_POLICY
)
set_property(CACHE Novapp_inih_DEPENDENCY_POLICY PROPERTY STRINGS "EMBEDDED")
if("${Novapp_inih_DEPENDENCY_POLICY}" STREQUAL "EMBEDDED")
add_subdirectory(vendor/inih)
add_subdirectory(vendor/inih SYSTEM)
elseif("${Novapp_inih_DEPENDENCY_POLICY}" STREQUAL "INSTALLED")
find_package(inih REQUIRED CONFIG)
endif()
Expand All @@ -138,7 +138,7 @@ set_property(
PROPERTY STRINGS "${Novapp_DEPENDENCY_POLICIES}"
)
if("${Novapp_Kokkos_DEPENDENCY_POLICY}" STREQUAL "EMBEDDED")
add_subdirectory(vendor/kokkos)
add_subdirectory(vendor/kokkos SYSTEM)
elseif("${Novapp_Kokkos_DEPENDENCY_POLICY}" STREQUAL "INSTALLED")
find_package(Kokkos 4...<5 REQUIRED CONFIG)
endif()
Expand Down
Loading