Skip to content

Commit

Permalink
remove non-existent install file
Browse files Browse the repository at this point in the history
  • Loading branch information
scivision committed Nov 2, 2020
1 parent 917853d commit e5a1668
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 18 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci_linux_meson.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:
with:
python-version: '3.x'

- run: pip install meson
- run: pip install meson ninja
- run: |
sudo apt update -yq
sudo apt install -yq --no-install-recommends gfortran ninja-build libnetcdff-dev
sudo apt install -yq --no-install-recommends gfortran libnetcdff-dev
- run: meson setup build
- run: meson compile -C build
Expand Down
15 changes: 9 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,18 +1,21 @@
cmake_minimum_required(VERSION 3.15)

include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/policy.cmake)
include(cmake/compiler_find.cmake)

project(nc4fortran
LANGUAGES C Fortran
VERSION 1.1.0
VERSION 1.1.1
DESCRIPTION "thin, light object-oriented NetCDF4 Fortran interface"
HOMEPAGE_URL https://github.com/geospace-code/nc4fortran)

include(CTest)
if(NOT DEFINED ${PROJECT_NAME}_BUILD_TESTING)
set(${PROJECT_NAME}_BUILD_TESTING ${BUILD_TESTING})
endif()

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

include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/policy.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/compilers.cmake)

# --- find NetCDF4
Expand Down Expand Up @@ -48,8 +51,8 @@ endif()

if(PROJECT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/install.cmake)

include(FeatureSummary)
set_package_properties(NetCDF PROPERTIES URL "https://www.unidata.ucar.edu/software/netcdf/" DESCRIPTION "fast, versatile file I/O format")
feature_summary(WHAT ALL)
endif()

include(FeatureSummary)
set_package_properties(NetCDF PROPERTIES URL "https://www.unidata.ucar.edu/software/netcdf/" DESCRIPTION "fast, versatile file I/O format")
feature_summary(WHAT ALL)
2 changes: 0 additions & 2 deletions Examples/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ if(NOT TARGET nc4fortran::nc4fortran)
message(FATAL_ERROR "NetCDF4 is not working on your system, so nc4fortran cannot work.")
endif()

set(CMAKE_EXPORT_COMPILE_COMMANDS on)

# --- Fortran interface for examples
add_library(fortran_interface fortran_interface.f90)
target_link_libraries(fortran_interface PRIVATE nc4fortran::nc4fortran)
Expand Down
3 changes: 0 additions & 3 deletions cmake/install.cmake
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
# --- package specific

install(FILES ${CMAKE_CURRENT_LIST_DIR}/netcdf.cmake ${CMAKE_CURRENT_LIST_DIR}/Modules/FindNetCDF.cmake
DESTINATION lib/cmake/${PROJECT_NAME})

install(FILES ${CMAKE_CURRENT_BINARY_DIR}/include/nc4fortran.mod
DESTINATION include)

Expand Down
4 changes: 0 additions & 4 deletions cmake/policy.cmake
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
set(CMAKE_EXPORT_COMPILE_COMMANDS on)

if(NOT DEFINED ${PROJECT_NAME}_BUILD_TESTING)
set(${PROJECT_NAME}_BUILD_TESTING ${BUILD_TESTING})
endif()

if(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
message(FATAL_ERROR "use cmake -B build or similar to avoid building in-source, which is messy")
endif()
Expand Down
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
project('nc4fortran', 'fortran',
meson_version : '>=0.52.0',
version: '1.1.0',
version: '1.1.1',
default_options : ['default_library=static', 'buildtype=release', 'warning_level=3'])

subdir('meson')
Expand Down

0 comments on commit e5a1668

Please sign in to comment.