浏览代码

Merge topic 'property-typo-fix' into release-3.27

c172eecea6 cmTarget: Restore Fortran_PREPROCESS property initialization

Acked-by: Kitware Robot <[email protected]>
Acked-by: buildbot <[email protected]>
Merge-request: !8654
Brad King 2 年之前
父节点
当前提交
d5b5af6ce8
共有 2 个文件被更改,包括 4 次插入2 次删除
  1. 1 1
      Source/cmTarget.cxx
  2. 3 1
      Tests/FortranOnly/CMakeLists.txt

+ 1 - 1
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),

+ 3 - 1
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()