cmake 3.12 compat

Author: scivision

CMakeLists.txt

@@ -15,8 +15,6 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/netcdf.cmake)
 
 set(CMAKE_Fortran_MODULE_DIRECTORY ${CMAKE_BINARY_DIR})
 
-add_subdirectory(src)
-
 # --- install
 
 if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
@@ -29,7 +27,6 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
   set(CMAKE_INSTALL_PREFIX "${HOME}/.local/nc4fortran" CACHE PATH "..." FORCE)
 endif()
 
-install(TARGETS nc4fortran
-  ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}
-  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX})
-install(FILES ${CMAKE_BINARY_DIR}/nc4fortran.mod DESTINATION ${CMAKE_INSTALL_PREFIX})
+# --- build
+
+add_subdirectory(src)

meson.build

@@ -19,3 +19,12 @@ if not meson.is_subproject()
 endif
 
 subdir('src')
+
+netcdf_interface = library('netcdf_interface',
+  sources: nc4_src,
+  dependencies: netcdf,
+  install: true)
+
+if not meson.is_subproject()
+  subdir('src/tests')
+endif

src/CMakeLists.txt

@@ -6,4 +6,9 @@ set_target_properties(nc4fortran PROPERTIES
   ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
   LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 
+install(TARGETS nc4fortran
+  ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}
+  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX})
+install(FILES ${CMAKE_BINARY_DIR}/nc4fortran.mod DESTINATION ${CMAKE_INSTALL_PREFIX})
+
 add_subdirectory(tests)

src/meson.build

@@ -1,8 +1,2 @@
-netcdf_interface = library('netcdf_interface',
-  sources: ['netcdf4_interface.f90', 'read.f90', 'reader.f90', 'write.f90', 'writer.f90', 'string_utils.f90'],
-  dependencies: netcdf,
-  install: true)
-
-if not meson.is_subproject()
-  subdir('tests')
-endif
+ nc4_src = files('netcdf4_interface.f90', 'read.f90', 'reader.f90',
+  'write.f90', 'writer.f90', 'string_utils.f90')