From c172eecea64154bdc3de4aa64a31771268e8d1da Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Tue, 25 Jul 2023 09:45:35 -0400 Subject: cmTarget: Restore Fortran_PREPROCESS property initialization Fix a typo from commit e522f8ca06 (cmTarget: factor out properties initialized for target which compile, 2023-02-01, v3.27.0-rc1~577^2~13), that broke this property. Also update the test suite to use this upgrade as some level of coverage. Fixes: #25123 --- Source/cmTarget.cxx | 2 +- Tests/FortranOnly/CMakeLists.txt | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index 81497f5..b53adf8 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -420,7 +420,7 @@ TargetProperty const StaticTargetProperties[] = { { "Fortran_FORMAT"_s, IC::CanCompileSources }, { "Fortran_MODULE_DIRECTORY"_s, IC::CanCompileSources }, { "Fortran_COMPILER_LAUNCHER"_s, IC::CanCompileSources }, - { "Fortran_PREPRPOCESS"_s, IC::CanCompileSources }, + { "Fortran_PREPROCESS"_s, IC::CanCompileSources }, { "Fortran_VISIBILITY_PRESET"_s, IC::CanCompileSources }, // ---- HIP COMMON_LANGUAGE_PROPERTIES(HIP), diff --git a/Tests/FortranOnly/CMakeLists.txt b/Tests/FortranOnly/CMakeLists.txt index b092c42..dfc28dd 100644 --- a/Tests/FortranOnly/CMakeLists.txt +++ b/Tests/FortranOnly/CMakeLists.txt @@ -169,8 +169,11 @@ endif() # extensions like '.F' and '.fpp'. if(CMAKE_Fortran_COMPILE_OPTIONS_PREPROCESS_OFF AND NOT CMAKE_Fortran_COMPILER_ID MATCHES "(Flang|NAG|PGI|NVHPC|SunPro|XL)") + + set(CMAKE_Fortran_PREPROCESS OFF) add_library(no_preprocess_target STATIC no_preprocess_target_upper.F) target_compile_options(no_preprocess_target PRIVATE -DINTEGER=nonsense) + unset(CMAKE_Fortran_PREPROCESS) add_library(no_preprocess_source STATIC no_preprocess_source_upper.F) target_compile_options(no_preprocess_source PRIVATE -DINTEGER=nonsense) @@ -181,7 +184,6 @@ if(CMAKE_Fortran_COMPILE_OPTIONS_PREPROCESS_OFF AND target_sources(no_preprocess_source PRIVATE no_preprocess_source_fpp.fpp) endif() - set_property(TARGET no_preprocess_target PROPERTY Fortran_PREPROCESS OFF) set_property(SOURCE no_preprocess_source_upper.F no_preprocess_source_fpp.fpp PROPERTY Fortran_PREPROCESS OFF) endif() -- cgit v0.12