diff options
| -rw-r--r-- | Help/command/FIND_XXX.txt | 4 | ||||
| -rw-r--r-- | Modules/Compiler/Cray-Fortran.cmake | 4 | ||||
| -rw-r--r-- | Source/CMakeVersion.cmake | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/Help/command/FIND_XXX.txt b/Help/command/FIND_XXX.txt index 97eecfc..aae1c38 100644 --- a/Help/command/FIND_XXX.txt +++ b/Help/command/FIND_XXX.txt @@ -11,8 +11,8 @@ The general signature is: |FIND_XXX| ( <VAR> name | |NAMES| - [HINTS path1 [path2 ... ENV var]] - [PATHS path1 [path2 ... ENV var]] + [HINTS [path | ENV var]... ] + [PATHS [path | ENV var]... ] [PATH_SUFFIXES suffix1 [suffix2 ...]] [DOC "cache documentation string"] [REQUIRED] diff --git a/Modules/Compiler/Cray-Fortran.cmake b/Modules/Compiler/Cray-Fortran.cmake index 696ae76..0d5e1c7 100644 --- a/Modules/Compiler/Cray-Fortran.cmake +++ b/Modules/Compiler/Cray-Fortran.cmake @@ -19,3 +19,7 @@ else() set(CMAKE_Fortran_COMPILE_OPTIONS_PREPROCESS_ON "-eZ") set(CMAKE_Fortran_COMPILE_OPTIONS_PREPROCESS_OFF "-dZ") endif() + +if (NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 11.0) + set(CMAKE_Fortran_PREPROCESS_SOURCE "<CMAKE_Fortran_COMPILER> -o <PREPROCESSED_SOURCE> <DEFINES> <INCLUDES> <FLAGS> -eP <SOURCE>") +endif() diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 406174b..f98c0ef 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,7 +1,7 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 20) -set(CMake_VERSION_PATCH 20210305) +set(CMake_VERSION_PATCH 20210308) #set(CMake_VERSION_RC 0) set(CMake_VERSION_IS_DIRTY 0) |