summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2023-11-22 15:03:58 (GMT)
committerBrad King <brad.king@kitware.com>2023-11-22 15:22:12 (GMT)
commit43d218d970665245692b8f8a1163a42ee9ee186d (patch)
treeb7386d5395f13c424b630060a40d36233cea7cea /Help
parent5c77facd7826f285fbf4d553160d1a542d60942b (diff)
downloadCMake-43d218d970665245692b8f8a1163a42ee9ee186d.zip
CMake-43d218d970665245692b8f8a1163a42ee9ee186d.tar.gz
CMake-43d218d970665245692b8f8a1163a42ee9ee186d.tar.bz2
VS: Add support for using Intel oneAPI Fortran compiler in .vfproj files
Add a `fortran={ifort,ifx}` field to `CMAKE_GENERATOR_TOOLSET` to specify which Intel Fortran compiler to use. Fixes: #25427
Diffstat (limited to 'Help')
-rw-r--r--Help/manual/cmake-variables.7.rst1
-rw-r--r--Help/release/dev/vs-ifx.rst7
-rw-r--r--Help/variable/CMAKE_GENERATOR_TOOLSET.rst14
-rw-r--r--Help/variable/CMAKE_VS_PLATFORM_TOOLSET_FORTRAN.rst12
4 files changed, 34 insertions, 0 deletions
diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst
index 35b57a5..c2e826c 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -131,6 +131,7 @@ Variables that Provide Information
/variable/CMAKE_VS_PLATFORM_TOOLSET
/variable/CMAKE_VS_PLATFORM_TOOLSET_CUDA
/variable/CMAKE_VS_PLATFORM_TOOLSET_CUDA_CUSTOM_DIR
+ /variable/CMAKE_VS_PLATFORM_TOOLSET_FORTRAN
/variable/CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE
/variable/CMAKE_VS_PLATFORM_TOOLSET_VERSION
/variable/CMAKE_VS_TARGET_FRAMEWORK_IDENTIFIER
diff --git a/Help/release/dev/vs-ifx.rst b/Help/release/dev/vs-ifx.rst
new file mode 100644
index 0000000..9e72cc7
--- /dev/null
+++ b/Help/release/dev/vs-ifx.rst
@@ -0,0 +1,7 @@
+vs-ifx
+------
+
+* :ref:`Visual Studio Generators` now support selecting between the
+ Intel oneAPI Fortran compiler (``ifx``) and the Intel classic Fortran
+ compiler (``ifort``) using a ``fortran=`` field in
+ :variable:`CMAKE_GENERATOR_TOOLSET`.
diff --git a/Help/variable/CMAKE_GENERATOR_TOOLSET.rst b/Help/variable/CMAKE_GENERATOR_TOOLSET.rst
index 4855477..b83fa01 100644
--- a/Help/variable/CMAKE_GENERATOR_TOOLSET.rst
+++ b/Help/variable/CMAKE_GENERATOR_TOOLSET.rst
@@ -48,6 +48,20 @@ Supported pairs are:
See the :variable:`CMAKE_VS_PLATFORM_TOOLSET_CUDA` and
:variable:`CMAKE_VS_PLATFORM_TOOLSET_CUDA_CUSTOM_DIR` variables.
+``fortran=<compiler>``
+ .. versionadded:: 3.29
+
+ Specify the Fortran compiler to use, among those that integrate with VS.
+ The value may be one of:
+
+ ``ifort``
+ Intel classic Fortran compiler.
+
+ ``ifx``
+ Intel oneAPI Fortran compiler.
+
+ See the :variable:`CMAKE_VS_PLATFORM_TOOLSET_FORTRAN` variable.
+
``host=<arch>``
Specify the host tools architecture as ``x64`` or ``x86``.
Supported by VS 2013 and above.
diff --git a/Help/variable/CMAKE_VS_PLATFORM_TOOLSET_FORTRAN.rst b/Help/variable/CMAKE_VS_PLATFORM_TOOLSET_FORTRAN.rst
new file mode 100644
index 0000000..e0ecb12
--- /dev/null
+++ b/Help/variable/CMAKE_VS_PLATFORM_TOOLSET_FORTRAN.rst
@@ -0,0 +1,12 @@
+CMAKE_VS_PLATFORM_TOOLSET_FORTRAN
+---------------------------------
+
+.. versionadded:: 3.29
+
+Fortran compiler to be used by Visual Studio projects.
+
+:ref:`Visual Studio Generators` support selecting among Fortran compilers
+whose Visual Studio Integration is installed. The compiler may be specified
+by a field in :variable:`CMAKE_GENERATOR_TOOLSET` of the form ``fortran=...``.
+CMake provides the selected Fortran compiler in this variable.
+The value may be empty if the field was not specified.