From 86d2e4276d934c0e04ad129881d1cc9d2916d121 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 22 Sep 2016 14:37:12 -0400 Subject: [PATCH 1/2] CheckFortranSourceCompiles: Fix FAIL_REGEX documentation typo --- Modules/CheckFortranSourceCompiles.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/CheckFortranSourceCompiles.cmake b/Modules/CheckFortranSourceCompiles.cmake index 0bdcffa8c..20d1fd99b 100644 --- a/Modules/CheckFortranSourceCompiles.cmake +++ b/Modules/CheckFortranSourceCompiles.cmake @@ -13,7 +13,7 @@ # ```` # Variable to store whether the source code compiled. # Will be created as an internal cache variable. -# ```` +# ``FAIL_REGEX `` # Fail if test output matches this regex. # # The following variables may be set before calling this macro to modify From 4d3874d5ad25d1907a56a92aba7ae94768726c72 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 22 Sep 2016 14:45:55 -0400 Subject: [PATCH 2/2] CheckFortranSourceCompiles: Add support for custom source extension Fortran compilers interpret the source extension to decide whether to preprocess and what language level to use by default. --- .../dev/CheckFortranSourceCompiles-custom-ext.rst | 6 ++++++ Modules/CheckFortranSourceCompiles.cmake | 15 +++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 Help/release/dev/CheckFortranSourceCompiles-custom-ext.rst diff --git a/Help/release/dev/CheckFortranSourceCompiles-custom-ext.rst b/Help/release/dev/CheckFortranSourceCompiles-custom-ext.rst new file mode 100644 index 000000000..bf62812da --- /dev/null +++ b/Help/release/dev/CheckFortranSourceCompiles-custom-ext.rst @@ -0,0 +1,6 @@ +CheckFortranSourceCompiles-custom-ext +------------------------------------- + +* The :module:`CheckFortranSourceCompiles` module macro + ``CHECK_Fortran_SOURCE_COMPILES`` gained a ``SRC_EXT`` option + to specify a custom test Fortran source file extension. diff --git a/Modules/CheckFortranSourceCompiles.cmake b/Modules/CheckFortranSourceCompiles.cmake index 20d1fd99b..967b83043 100644 --- a/Modules/CheckFortranSourceCompiles.cmake +++ b/Modules/CheckFortranSourceCompiles.cmake @@ -4,7 +4,8 @@ # # Check if given Fortran source compiles and links into an executable:: # -# CHECK_Fortran_SOURCE_COMPILES( [FAIL_REGEX ]) +# CHECK_Fortran_SOURCE_COMPILES( [FAIL_REGEX ] +# [SRC_EXT ]) # # The arguments are: # @@ -15,6 +16,8 @@ # Will be created as an internal cache variable. # ``FAIL_REGEX `` # Fail if test output matches this regex. +# ``SRC_EXT `` +# Use source extension ``.`` instead of the default ``.F``. # # The following variables may be set before calling this macro to modify # the way the check is run:: @@ -43,9 +46,10 @@ macro(CHECK_Fortran_SOURCE_COMPILES SOURCE VAR) if(NOT DEFINED "${VAR}") set(_FAIL_REGEX) + set(_SRC_EXT) set(_key) foreach(arg ${ARGN}) - if("${arg}" MATCHES "^(FAIL_REGEX)$") + if("${arg}" MATCHES "^(FAIL_REGEX|SRC_EXT)$") set(_key "${arg}") elseif(_key) list(APPEND _${_key} "${arg}") @@ -53,6 +57,9 @@ macro(CHECK_Fortran_SOURCE_COMPILES SOURCE VAR) message(FATAL_ERROR "Unknown argument:\n ${arg}\n") endif() endforeach() + if(NOT _SRC_EXT) + set(_SRC_EXT F) + endif() set(MACRO_CHECK_FUNCTION_DEFINITIONS "-D${VAR} ${CMAKE_REQUIRED_FLAGS}") if(CMAKE_REQUIRED_LIBRARIES) @@ -67,7 +74,7 @@ macro(CHECK_Fortran_SOURCE_COMPILES SOURCE VAR) else() set(CHECK_Fortran_SOURCE_COMPILES_ADD_INCLUDES) endif() - file(WRITE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src.F" + file(WRITE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src.${_SRC_EXT}" "${SOURCE}\n") if(NOT CMAKE_REQUIRED_QUIET) @@ -75,7 +82,7 @@ macro(CHECK_Fortran_SOURCE_COMPILES SOURCE VAR) endif() try_compile(${VAR} ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src.F + ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src.${_SRC_EXT} COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} ${CHECK_Fortran_SOURCE_COMPILES_ADD_LIBRARIES} CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_FUNCTION_DEFINITIONS}