verify CMake 3.11+ compatibility

Author: scivision

cmake/compilers.cmake

@@ -24,20 +24,20 @@ endif()
 # --- C compile flags
 if(CMAKE_C_COMPILER_ID MATCHES "Clang|GNU|^Intel")
   add_compile_options(
-  "$<$<AND:$<COMPILE_LANGUAGE:C,CXX>,$<CONFIG:Debug>>:-Wextra>"
-  "$<$<COMPILE_LANGUAGE:C,CXX>:-Wall>"
+  "$<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:Debug>>:-Wextra>"
+  "$<$<COMPILE_LANGUAGE:C>:-Wall>"
   "$<$<COMPILE_LANGUAGE:C>:-Werror=implicit-function-declaration>"
   )
 elseif(CMAKE_C_COMPILER_ID MATCHES "MSVC")
-  add_compile_options("$<$<COMPILE_LANGUAGE:C,CXX>:/W3>")
+  add_compile_options("$<$<COMPILE_LANGUAGE:C>:/W3>")
 endif()
 
 if(WIN32)
   if(CMAKE_C_COMPILER_ID MATCHES "^Intel|MSVC")
-    add_compile_options($<$<AND:$<COMPILE_LANGUAGE:C,CXX>,$<CONFIG:Debug>>:/Od>)
+    add_compile_options($<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:Debug>>:/Od>)
   endif()
 elseif(CMAKE_C_COMPILER_ID MATCHES "^Intel")
-  add_compile_options($<$<AND:$<COMPILE_LANGUAGE:C,CXX>,$<CONFIG:Debug>>:-O0>)
+  add_compile_options($<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:Debug>>:-O0>)
 endif()
 
 # --- Fortran compile flags
@@ -48,6 +48,12 @@ add_compile_options(
 "$<$<AND:$<COMPILE_LANGUAGE:Fortran>,$<CONFIG:Debug>>:-traceback;-check;-debug>"
 )
 
+if(WIN32)
+  add_compile_options($<$<AND:$<COMPILE_LANGUAGE:Fortran>,$<CONFIG:Debug>>:/Od>)
+else()
+  add_compile_options($<$<AND:$<COMPILE_LANGUAGE:Fortran>,$<CONFIG:Debug>>:-O0>)
+endif()
+
 elseif(CMAKE_Fortran_COMPILER_ID STREQUAL "GNU")
 
 add_compile_options(
@@ -58,13 +64,6 @@ add_compile_options(
 
 endif()
 
-
-if(WIN32)
-  add_compile_options($<$<AND:$<COMPILE_LANG_AND_ID:Fortran,Intel,IntelLLVM>,$<CONFIG:Debug>>:/Od>)
-else()
-  add_compile_options($<$<AND:$<COMPILE_LANG_AND_ID:Fortran,Intel,IntelLLVM>,$<CONFIG:Debug>>:-O0>)
-endif()
-
 # --- code coverage
 if(ENABLE_COVERAGE)
   include(${CMAKE_CURRENT_LIST_DIR}/Modules/CodeCoverage.cmake)

cmake/options.cmake

@@ -2,8 +2,6 @@ message(STATUS "${PROJECT_NAME} ${PROJECT_VERSION} CMake ${CMAKE_VERSION} Toolch
 
 include(GNUInstallDirs)
 
-message(STATUS "${PROJECT_NAME} ${PROJECT_VERSION}  CMake ${CMAKE_VERSION}")
-
 option(ENABLE_COVERAGE "Code coverage tests")
 option(tidy "Run clang-tidy on the code")
 

test/CMakeLists.txt

@@ -3,7 +3,9 @@
 
 set_property(DIRECTORY PROPERTY LABELS h5fortran)
 
-add_compile_options("$<$<COMPILE_LANG_AND_ID:Fortran,GNU>:-Wno-compare-reals;-Wno-maybe-uninitialized>")
+if(CMAKE_Fortran_COMPILER_ID STREQUAL "GNU")
+  add_compile_options("$<$<COMPILE_LANGUAGE:Fortran>:-Wno-compare-reals;-Wno-maybe-uninitialized>")
+endif()
 
 set(attr_file ${CMAKE_CURRENT_BINARY_DIR}/test_attr_py.h5)
 set(shape_file ${CMAKE_CURRENT_BINARY_DIR}/test_shape.h5)