selected_logical_kind if available

Author: scivision

cmake/compilers.cmake

@@ -103,16 +103,11 @@ endif()
 endblock()
 
 
-check_source_compiles(Fortran
-"program test
-implicit none
+check_source_compiles(Fortran "program test
 real :: a(1)
-print '(L1)', is_contiguous(a)
+if (.not. is_contiguous(a)) error stop
 end program"
-f08contiguous
-)
-
-include(${CMAKE_CURRENT_LIST_DIR}/f08submod_bind.cmake)
+f08contiguous)
 
 
 block()

cmake/f08submod_bind.cmake

@@ -5,10 +5,10 @@ module bad_bool
 
 implicit none
 
-integer, parameter :: lk = 8
+include "logical_kind.inc"
 
 type, bind(C) :: bool_args
-	logical(8) :: value
+	logical(lk) :: value
 	integer(C_INT) :: dummy
 end type
 

src/bool/bad_bool.f90

@@ -1,5 +1,16 @@
 set_property(DIRECTORY PROPERTY LABELS bool)
 
+check_source_compiles(Fortran "program test
+integer, parameter :: lk = selected_logical_kind(1)
+end program"
+f23logical_kind)
+
+if(f23logical_kind)
+  file(GENERATE OUTPUT logical_kind.inc CONTENT "integer, parameter :: lk = selected_logical_kind(64)")
+else()
+  file(GENERATE OUTPUT logical_kind.inc CONTENT "integer, parameter :: lk = 8")
+endif()
+
 add_library(bool_fortran OBJECT ${PROJECT_SOURCE_DIR}/src/bool/logbool.f90)
 target_include_directories(bool_fortran INTERFACE ${PROJECT_SOURCE_DIR}/src/bool)
 
@@ -19,12 +30,13 @@ add_test(NAME Cpp_Fortran_bool COMMAND cxx_fortran_bool)
 
 add_executable(fortran_cxx_bool main.f90)
 target_link_libraries(fortran_cxx_bool PRIVATE bool_cxx)
+target_include_directories(fortran_cxx_bool PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
 set_property(TARGET fortran_cxx_bool PROPERTY LINKER_LANGUAGE ${linker_lang})
 add_test(NAME Fortran_Cpp_bool COMMAND fortran_cxx_bool)
 
 add_executable(fortran_c_bool main.f90)
 target_link_libraries(fortran_c_bool PRIVATE bool_c)
-set_property(TARGET fortran_c_bool PROPERTY LINKER_LANGUAGE Fortran)
+target_include_directories(fortran_c_bool PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
 add_test(NAME Fortran_C_bool COMMAND fortran_c_bool)
 
 add_executable(c_cxx_bool main.c)
@@ -38,11 +50,14 @@ add_test(NAME Cpp_C_bool COMMAND cxx_c_bool)
 
 add_executable(fortran_c_bad_bool bad_interface.f90)
 target_link_libraries(fortran_c_bad_bool PRIVATE bool_c)
-set_property(TARGET fortran_c_bad_bool PROPERTY LINKER_LANGUAGE Fortran)
+target_include_directories(fortran_c_bad_bool PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
 add_test(NAME Fortran_C_bad_bool COMMAND ${CMAKE_COMMAND} -E env $<TARGET_FILE:fortran_c_bad_bool>)
 
 add_library(bad_bool_fortran OBJECT ${PROJECT_SOURCE_DIR}/src/bool/bad_bool.f90)
-target_include_directories(bad_bool_fortran INTERFACE ${PROJECT_SOURCE_DIR}/src/bool)
+target_include_directories(bad_bool_fortran
+INTERFACE ${PROJECT_SOURCE_DIR}/src/bool
+PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
+)
 
 add_executable(c_fortran_bad_bool main.c)
 target_link_libraries(c_fortran_bad_bool PRIVATE bad_bool_fortran)
@@ -53,4 +68,6 @@ target_link_libraries(cxx_fortran_bad_bool PRIVATE bad_bool_fortran)
 add_test(NAME Cpp_Fortran_bad_bool COMMAND ${CMAKE_COMMAND} -E env $<TARGET_FILE:cxx_fortran_bad_bool>)
 
 set_tests_properties(C_Fortran_bad_bool Fortran_C_bad_bool Cpp_Fortran_bad_bool PROPERTIES WILL_FAIL true)
+
 set_target_properties(c_fortran_bool c_fortran_bad_bool PROPERTIES LINKER_LANGUAGE C)
+set_target_properties(fortran_c_bool fortran_c_bad_bool PROPERTIES LINKER_LANGUAGE Fortran)

test/bool/CMakeLists.txt

@@ -6,8 +6,10 @@ program bad_interface
 
 implicit none
 
+include "logical_kind.inc"
+
 type, bind(C) :: bool_args
-logical(8) :: value
+logical(lk) :: value
 integer(C_INT) :: dummy
 end type