diff options
| author | Brad King <brad.king@kitware.com> | 2023-11-27 13:41:38 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-11-27 13:41:55 (GMT) |
| commit | 81e836e0fe9732d8ebfd806fe77e6f1ab523a98a (patch) | |
| tree | 9abd370062bba2244bc315f42f29774da32256bc /Modules | |
| parent | 2978730a70972352ea2ce09f5a1e48250215740c (diff) | |
| parent | 43d218d970665245692b8f8a1163a42ee9ee186d (diff) | |
| download | CMake-81e836e0fe9732d8ebfd806fe77e6f1ab523a98a.zip CMake-81e836e0fe9732d8ebfd806fe77e6f1ab523a98a.tar.gz CMake-81e836e0fe9732d8ebfd806fe77e6f1ab523a98a.tar.bz2 | |
Merge topic 'vs-ifx'
43d218d970 VS: Add support for using Intel oneAPI Fortran compiler in .vfproj files
5c77facd78 VS: Fix Intel plugin version detection fallback
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9001
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeDetermineCompilerId.cmake | 8 | ||||
| -rw-r--r-- | Modules/CompilerId/VS-Intel.vfproj.in | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake index 4f1eaba..ffba1cb 100644 --- a/Modules/CMakeDetermineCompilerId.cmake +++ b/Modules/CMakeDetermineCompilerId.cmake @@ -402,7 +402,13 @@ Id flags: ${testflags} ${CMAKE_${lang}_COMPILER_ID_FLAGS_ALWAYS} elseif(lang STREQUAL Fortran) set(v Intel) set(ext vfproj) - set(id_cl ifort.exe) + if(CMAKE_VS_PLATFORM_TOOLSET_FORTRAN) + set(id_cl "${CMAKE_VS_PLATFORM_TOOLSET_FORTRAN}.exe") + set(id_UseCompiler "UseCompiler=\"${CMAKE_VS_PLATFORM_TOOLSET_FORTRAN}Compiler\"") + else() + set(id_cl ifort.exe) + set(id_UseCompiler "") + endif() elseif(lang STREQUAL CSharp) set(v 10) set(ext csproj) diff --git a/Modules/CompilerId/VS-Intel.vfproj.in b/Modules/CompilerId/VS-Intel.vfproj.in index 044dd20..fdd9d9d 100644 --- a/Modules/CompilerId/VS-Intel.vfproj.in +++ b/Modules/CompilerId/VS-Intel.vfproj.in @@ -13,7 +13,7 @@ Name="Debug|@id_platform@" OutputDirectory="." IntermediateDirectory="$(ConfigurationName)" - > + @id_UseCompiler@> <Tool Name="VFFortranCompilerTool" DebugInformationFormat="debugEnabled" |