Skip to content

Commit 97c77c8

Browse files
committed
better CMake .gitignore
1 parent 4bdc8c8 commit 97c77c8

File tree

7 files changed

+11
-29
lines changed

7 files changed

+11
-29
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ name: ci
22

33
env:
44
HOMEBREW_NO_INSTALL_CLEANUP: 1
5+
CTEST_NO_TESTS_ACTION: error
56

67
on:
78
push:
@@ -24,14 +25,14 @@ jobs:
2425

2526
strategy:
2627
matrix:
27-
os: [ubuntu-22.04]
28+
os: [ubuntu-latest]
2829
shared: [true, false]
29-
gcc: [9, 11]
30+
gcc: [9, 11, 12]
3031
mpi: [mpich, openmpi]
3132
include:
3233
- os: macos-latest
3334
mpi: openmpi
34-
gcc: 11
35+
gcc: 12
3536

3637
runs-on: ${{ matrix.os }}
3738
env:

benchmark/CMakeLists.txt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.11...3.24)
1+
cmake_minimum_required(VERSION 3.14...3.24)
22

33
project(h5mpi-benchmark
44
LANGUAGES C CXX Fortran
@@ -8,10 +8,7 @@ enable_testing()
88

99
set_property(DIRECTORY PROPERTY LABELS benchmark)
1010

11-
# --- auto-ignore build directory
12-
if(NOT EXISTS ${PROJECT_BINARY_DIR}/.gitignore)
13-
file(WRITE ${PROJECT_BINARY_DIR}/.gitignore "*")
14-
endif()
11+
file(GENERATE OUTPUT .gitignore CONTENT "*")
1512

1613
if(CMAKE_VERSION VERSION_LESS 3.21)
1714
get_property(not_top DIRECTORY PROPERTY PARENT_DIRECTORY)

cmake/abi_check/CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.1...3.25)
1+
cmake_minimum_required(VERSION 3.5)
22
project(abi_check LANGUAGES C Fortran)
33

44
enable_testing()
@@ -17,5 +17,3 @@ add_library(addone_f OBJECT addone.f90)
1717
add_executable(main_c main.c $<TARGET_OBJECTS:addone_f>)
1818
set_property(TARGET main_c PROPERTY LINKER_LANGUAGE C)
1919
add_test(NAME C_main COMMAND main_c)
20-
21-
set_property(TEST Fortran_main C_main PROPERTY TIMEOUT 10)

cmake/compilers.cmake

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,14 @@ if(NOT abi_ok)
55
try_compile(abi_ok
66
${CMAKE_CURRENT_BINARY_DIR}/abi_check ${CMAKE_CURRENT_LIST_DIR}/abi_check
77
abi_check
8-
OUTPUT_VARIABLE abi_log
98
)
109
if(abi_ok)
1110
message(CHECK_PASS "OK")
1211
else()
1312
set(err_log ${CMAKE_CURRENT_BINARY_DIR}/abi_check/CMakeError.log)
1413
message(FATAL_ERROR "ABI-incompatible compilers:
1514
C compiler ${CMAKE_C_COMPILER_ID} ${CMAKE_C_COMPILER_VERSION}
16-
Fortran compiler ${CMAKE_Fortran_COMPILER_ID} ${CMAKE_Fortran_COMPILER_VERSION}
17-
For logged errors see ${err_log}
18-
"
19-
)
20-
file(WRITE ${err_log} ${abi_log})
15+
Fortran compiler ${CMAKE_Fortran_COMPILER_ID} ${CMAKE_Fortran_COMPILER_VERSION}")
2116
endif()
2217
endif()
2318

cmake/options.cmake

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,4 @@ if(CMAKE_PREFIX_PATH)
3333
get_filename_component(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ABSOLUTE)
3434
endif()
3535

36-
# --- auto-ignore build directory
37-
if(NOT EXISTS ${PROJECT_BINARY_DIR}/.gitignore)
38-
file(WRITE ${PROJECT_BINARY_DIR}/.gitignore "*")
39-
endif()
36+
file(GENERATE OUTPUT .gitignore CONTENT "*")

reference/CMakeLists.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,7 @@ cmake_path(SET CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/../cmake/Modules)
1111
find_package(MPI COMPONENTS Fortran REQUIRED)
1212
find_package(HDF5 COMPONENTS parallel Fortran REQUIRED)
1313

14-
# --- auto-ignore build directory
15-
if(NOT EXISTS ${PROJECT_BINARY_DIR}/.gitignore)
16-
file(WRITE ${PROJECT_BINARY_DIR}/.gitignore "*")
17-
endif()
14+
file(GENERATE OUTPUT .gitignore CONTENT "*")
1815

1916
add_executable(write_char write_char.f90)
2017
target_link_libraries(write_char PRIVATE HDF5::HDF5 MPI::MPI_Fortran)

scripts/CMakeLists.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,4 @@ add_feature_info(HDF5parallel hdf5_parallel "HDF5 MPI layer")
6464

6565
feature_summary(WHAT ENABLED_FEATURES DISABLED_FEATURES)
6666

67-
# --- auto-ignore build directory
68-
if(NOT EXISTS ${PROJECT_BINARY_DIR}/.gitignore)
69-
file(WRITE ${PROJECT_BINARY_DIR}/.gitignore "*")
70-
endif()
67+
file(GENERATE OUTPUT .gitignore CONTENT "*")

0 commit comments

Comments
 (0)