build cleanup

Author: scivision

CMakeLists.txt

@@ -4,7 +4,7 @@ if(NOT CMAKE_BUILD_TYPE)
 endif()
 project(h5fortran
   LANGUAGES Fortran
-  VERSION 2.5.1
+  VERSION 2.5.2
   DESCRIPTION "thin, light, easy HDF5 Fortran interface"
   HOMEPAGE_URL https://github.com/scivision/h5fortran)
 enable_testing()
@@ -16,29 +16,14 @@ option(test_shaky "run shaky tests" OFF)
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/compilers.cmake)
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/hdf5.cmake)
 
-if(PROJECT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
-  set(CTEST_TEST_TIMEOUT 15)
-  # --- install config (before build)
-
-  if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-    if(WIN32)
-      set(HOME $ENV{USERPROFILE})
-    else()
-      set(HOME $ENV{HOME})
-    endif()
-
-    set(CMAKE_INSTALL_PREFIX "${HOME}/.local/h5fortran" CACHE PATH "..." FORCE)
-  endif()
-endif()
+set(CTEST_TEST_TIMEOUT 15)
+
 # --- build
 
 add_subdirectory(src)
 
 add_subdirectory(src/tests)
 
 if(PROJECT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
-  set(CPACK_GENERATOR ZIP)
-  set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
-  set(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
-  include(CPack)
-endif()
+  include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/install.cmake)
+endif()

cmake/compilers.cmake

@@ -1,27 +1,17 @@
-if(NOT PROJECT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
-  # this will NOT return for ExternalProject
-  # this will return for FetchContent
-  return()
-endif()
-
 if(CMAKE_Fortran_COMPILER_ID STREQUAL Intel)
   if(WIN32)
     set(CMAKE_Fortran_FLAGS "/stand:f18 /traceback /warn /heap-arrays ")
   else()
     set(CMAKE_Fortran_FLAGS "-stand f18 -traceback -warn -heap-arrays ")
   endif()
 elseif(CMAKE_Fortran_COMPILER_ID STREQUAL GNU)
-  string(APPEND CMAKE_Fortran_FLAGS "-march=native -fimplicit-none ")
-
-  if(CMAKE_BUILD_TYPE STREQUAL Debug)
-    string(APPEND CMAKE_Fortran_FLAGS "-fcheck=all ")
-  endif()
+  string(APPEND CMAKE_Fortran_FLAGS "-fimplicit-none -Wall -Wextra ")
+  string(APPEND CMAKE_Fortran_FLAGS_DEBUG "-fcheck=all ")
+  add_compile_options(-march=native)
 
   if(CMAKE_Fortran_COMPILER_VERSION VERSION_GREATER_EQUAL 8)
     string(APPEND CMAKE_Fortran_FLAGS "-std=f2018 ")
   endif()
-
-  string(APPEND CMAKE_Fortran_FLAGS "-Wall -Wextra -Wpedantic ")
 elseif(CMAKE_Fortran_COMPILER_ID STREQUAL PGI)
   set(CMAKE_Fortran_FLAGS "-C -Mdclchk ")
 elseif(CMAKE_Fortran_COMPILER_ID STREQUAL Flang)

cmake/install.cmake

@@ -31,3 +31,12 @@ install(FILES
   ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
   ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
   DESTINATION lib/cmake/${PROJECT_NAME})
+
+# --- CPack
+
+if(PROJECT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
+  set(CPACK_GENERATOR ZIP)
+  set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
+  set(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
+  include(CPack)
+endif()

meson.build

@@ -1,6 +1,6 @@
 project('h5fortran', 'fortran',
   meson_version : '>=0.52.0',
-  version : '2.5.1',
+  version : '2.5.2',
   default_options : ['default_library=static', 'buildtype=release', 'warning_level=3'])
 
 subdir('meson')

src/CMakeLists.txt

@@ -13,7 +13,3 @@ set_target_properties(h5fortran PROPERTIES
   ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
   LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 add_library(h5fortran::h5fortran ALIAS h5fortran)
-
-if(PROJECT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
-  include(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/install.cmake)
-endif()