Merge branch 'master' of https://github.com/fortran-lang/stdlib into hash_maps

Author: wclodius2

CHANGELOG.md

@@ -1,6 +1,8 @@
-# Unreleased
+# Version 0.2.0
 
-Features available from the latest git source
+Full release notes available at [v0.2.0] tag.
+
+[v0.2.0]: https://github.com/fortran-lang/stdlib/releases/tag/v0.2.0
 
 - new module `stdlib_hash_32bit`
   [#573](https://github.com/fortran-lang/stdlib/pull/573)

CMakeLists.txt

@@ -1,4 +1,8 @@
 cmake_minimum_required(VERSION 3.14.0)
+
+# Include overwrites before setting up the project
+set(CMAKE_USER_MAKE_RULES_OVERRIDE ${CMAKE_CURRENT_SOURCE_DIR}/config/DefaultFlags.cmake)
+
 project(fortran_stdlib
         LANGUAGES Fortran
         DESCRIPTION "Community driven and agreed upon de facto standard library for Fortran"
@@ -22,31 +26,9 @@ include(${PROJECT_SOURCE_DIR}/cmake/stdlib.cmake)
 # --- CMake specific configuration and package data export
 add_subdirectory(config)
 
-# --- compiler options
-if(CMAKE_Fortran_COMPILER_ID STREQUAL GNU)
-  if(CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 9.0)
-    message(FATAL_ERROR "GCC Version 9 or newer required")
-  endif()
-  add_compile_options(-fimplicit-none)
-  add_compile_options(-ffree-line-length-132)
-  add_compile_options(-fno-range-check) # Needed for gfortran 9 and
-  # earlier for hash functions 
-  add_compile_options(-Wall)
-  add_compile_options(-Wextra)
-  add_compile_options(-Wimplicit-procedure)
-  # -pedantic-errors triggers a false positive for optional arguments of elemental functions,
-  # see test_optval and https://gcc.gnu.org/bugzilla/show_bug.cgi?id=95446
-  if(CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 11.0)
-    add_compile_options(-pedantic-errors)
-  endif()
-  add_compile_options(-std=f2018)
-elseif(CMAKE_Fortran_COMPILER_ID MATCHES "^Intel")
-  if(WIN32)
-    set(fortran_flags /stand:f18 /warn:declarations,general,usage,interfaces,unused)
-  else()
-    set(fortran_flags -stand f18 -warn declarations,general,usage,interfaces,unused)
-  endif()
-  add_compile_options("$<$<COMPILE_LANGUAGE:Fortran>:${fortran_flags}>")
+# --- compiler selection
+if(CMAKE_Fortran_COMPILER_ID STREQUAL GNU AND CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 9.0)
+  message(FATAL_ERROR "GCC Version 9 or newer required")
 endif()
 
 # --- compiler feature checks

VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

config/DefaultFlags.cmake

@@ -0,0 +1,50 @@
+if(CMAKE_Fortran_COMPILER_ID STREQUAL "GNU")
+  set(
+    CMAKE_Fortran_FLAGS_INIT
+    "-fimplicit-none"
+    "-ffree-line-length-132"
+  )
+  set(
+    CMAKE_Fortran_FLAGS_RELEASE_INIT
+  )
+  set(
+    CMAKE_Fortran_FLAGS_DEBUG_INIT
+    "-Wall"
+    "-Wextra"
+    "-Wimplicit-procedure"
+    "-std=f2018"
+  )
+elseif(CMAKE_Fortran_COMPILER_ID MATCHES "^Intel")
+  set(
+    CMAKE_Fortran_FLAGS_INIT
+  )
+  set(
+    CMAKE_Fortran_FLAGS_RELEASE_INIT
+  )
+  if(WIN32)
+    set(
+      CMAKE_Fortran_FLAGS_DEBUG_INIT
+      "/stand:f18"
+      "/warn:declarations,general,usage,interfaces,unused"
+    )
+  else()
+    set(
+      CMAKE_Fortran_FLAGS_DEBUG_INIT
+      "-stand f18"
+      "-warn declarations,general,usage,interfaces,unused"
+    )
+  endif()
+else()
+  set(
+    CMAKE_Fortran_FLAGS_INIT
+  )
+  set(
+    CMAKE_Fortran_FLAGS_RELEASE_INIT
+  )
+  set(
+    CMAKE_Fortran_FLAGS_DEBUG_INIT
+  )
+endif()
+string(REPLACE ";" " " CMAKE_Fortran_FLAGS_INIT "${CMAKE_Fortran_FLAGS_INIT}")
+string(REPLACE ";" " " CMAKE_Fortran_FLAGS_RELEASE_INIT "${CMAKE_Fortran_FLAGS_RELEASE_INIT}")
+string(REPLACE ";" " " CMAKE_Fortran_FLAGS_DEBUG_INIT "${CMAKE_Fortran_FLAGS_DEBUG_INIT}")

src/CMakeLists.txt

@@ -98,6 +98,14 @@ set(SRC
 
 add_library(${PROJECT_NAME} ${SRC})
 
+if(CMAKE_Fortran_COMPILER_ID STREQUAL GNU AND CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 10.0)
+  target_compile_options(
+     ${PROJECT_NAME}
+     PRIVATE
+     $<$<COMPILE_LANGUAGE:Fortran>:-fno-range-check>
+   )
+endif()
+
 set(LIB_MOD_DIR ${CMAKE_CURRENT_BINARY_DIR}/mod_files/)
 # We need the module directory before we finish the configure stage since the
 # build interface might resolve before the module directory is generated by CMake

src/tests/hash_functions/CMakeLists.txt

@@ -1,25 +1,26 @@
 #ADDTEST(hash_functions)
 
-set(SRC
-nmhash_scalar.c
-pengyhash.c
-SpookyV2.cpp
-SpookyV2Test.cpp
-waterhash.c
-generate_hash_arrays.cpp
-)
-
 enable_language(CXX)
 enable_language(C)
 
-add_library(libc_hash ${SRC})
-
-set(CMAKE_FORTRAN_LINK_EXECUTABLE "<CMAKE_Fortran_COMPILER>  <CMAKE_Fortran_LINK_FLAGS> <LINK_FLAGS> <FLAGS> <OBJECTS>  -o <TARGET> <LINK_LIBRARIES>")
-
-add_executable(test_hash_functions test_hash_functions.f90)
-target_link_libraries(test_hash_functions "${PROJECT_NAME}" "test-drive::test-drive" "libc_hash")
-add_test(NAME hash_functions
-             COMMAND $<TARGET_FILE:test_hash_functions> ${CMAKE_CURRENT_BINARY_DIR}
-             WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
-
-set_target_properties(test_hash_functions PROPERTIES LINKER_LANGUAGE FORTRAN)
+ADDTEST(hash_functions)
+target_sources(
+  test_hash_functions
+  PRIVATE
+  nmhash_scalar.c
+  pengyhash.c
+  SpookyV2.cpp
+  SpookyV2Test.cpp
+  waterhash.c
+  generate_hash_arrays.cpp
+)
+if(CMAKE_Fortran_COMPILER_ID MATCHES "^Intel")
+  set_target_properties(test_hash_functions PROPERTIES LINKER_LANGUAGE Fortran)
+endif()
+if(CMAKE_Fortran_COMPILER_ID STREQUAL GNU AND CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 10.0)
+  target_compile_options(
+    test_hash_functions
+    PRIVATE
+    $<$<COMPILE_LANGUAGE:Fortran>:-fno-range-check>
+   )
+endif()

src/tests/hash_functions_perf/CMakeLists.txt

@@ -1,2 +1,10 @@
 ADDTEST(32_bit_hash_performance)
 ADDTEST(64_bit_hash_performance)
+
+if(CMAKE_Fortran_COMPILER_ID STREQUAL GNU AND CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 10.0)
+  target_compile_options(
+    test_64_bit_hash_performance
+    PRIVATE
+    $<$<COMPILE_LANGUAGE:Fortran>:-fno-range-check>
+   )
+endif()