Skip to content

Commit e5a1668

Browse files
committed
remove non-existent install file
1 parent 917853d commit e5a1668

File tree

6 files changed

+12
-18
lines changed

6 files changed

+12
-18
lines changed

.github/workflows/ci_linux_meson.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ jobs:
1717
with:
1818
python-version: '3.x'
1919

20-
- run: pip install meson
20+
- run: pip install meson ninja
2121
- run: |
2222
sudo apt update -yq
23-
sudo apt install -yq --no-install-recommends gfortran ninja-build libnetcdff-dev
23+
sudo apt install -yq --no-install-recommends gfortran libnetcdff-dev
2424
2525
- run: meson setup build
2626
- run: meson compile -C build

CMakeLists.txt

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
11
cmake_minimum_required(VERSION 3.15)
22

3+
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/policy.cmake)
34
include(cmake/compiler_find.cmake)
45

56
project(nc4fortran
67
LANGUAGES C Fortran
7-
VERSION 1.1.0
8+
VERSION 1.1.1
89
DESCRIPTION "thin, light object-oriented NetCDF4 Fortran interface"
910
HOMEPAGE_URL https://github.com/geospace-code/nc4fortran)
1011

1112
include(CTest)
13+
if(NOT DEFINED ${PROJECT_NAME}_BUILD_TESTING)
14+
set(${PROJECT_NAME}_BUILD_TESTING ${BUILD_TESTING})
15+
endif()
1216

1317
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules)
1418

15-
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/policy.cmake)
1619
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/compilers.cmake)
1720

1821
# --- find NetCDF4
@@ -48,8 +51,8 @@ endif()
4851

4952
if(PROJECT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
5053
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/install.cmake)
51-
52-
include(FeatureSummary)
53-
set_package_properties(NetCDF PROPERTIES URL "https://www.unidata.ucar.edu/software/netcdf/" DESCRIPTION "fast, versatile file I/O format")
54-
feature_summary(WHAT ALL)
5554
endif()
55+
56+
include(FeatureSummary)
57+
set_package_properties(NetCDF PROPERTIES URL "https://www.unidata.ucar.edu/software/netcdf/" DESCRIPTION "fast, versatile file I/O format")
58+
feature_summary(WHAT ALL)

Examples/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ if(NOT TARGET nc4fortran::nc4fortran)
2424
message(FATAL_ERROR "NetCDF4 is not working on your system, so nc4fortran cannot work.")
2525
endif()
2626

27-
set(CMAKE_EXPORT_COMPILE_COMMANDS on)
28-
2927
# --- Fortran interface for examples
3028
add_library(fortran_interface fortran_interface.f90)
3129
target_link_libraries(fortran_interface PRIVATE nc4fortran::nc4fortran)

cmake/install.cmake

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
# --- package specific
22

3-
install(FILES ${CMAKE_CURRENT_LIST_DIR}/netcdf.cmake ${CMAKE_CURRENT_LIST_DIR}/Modules/FindNetCDF.cmake
4-
DESTINATION lib/cmake/${PROJECT_NAME})
5-
63
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/include/nc4fortran.mod
74
DESTINATION include)
85

cmake/policy.cmake

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
set(CMAKE_EXPORT_COMPILE_COMMANDS on)
22

3-
if(NOT DEFINED ${PROJECT_NAME}_BUILD_TESTING)
4-
set(${PROJECT_NAME}_BUILD_TESTING ${BUILD_TESTING})
5-
endif()
6-
73
if(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
84
message(FATAL_ERROR "use cmake -B build or similar to avoid building in-source, which is messy")
95
endif()

meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
project('nc4fortran', 'fortran',
22
meson_version : '>=0.52.0',
3-
version: '1.1.0',
3+
version: '1.1.1',
44
default_options : ['default_library=static', 'buildtype=release', 'warning_level=3'])
55

66
subdir('meson')

0 commit comments

Comments
 (0)