diff options
| author | Brad King <brad.king@kitware.com> | 2022-01-31 16:35:58 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-01-31 16:35:58 (GMT) |
| commit | d6bfce26ad59086282c27b090cefa00ccdeed7e7 (patch) | |
| tree | 4efe161fed729ec24ec63ce2028f29ed3e08dbcb | |
| parent | 7cc7f9aa2637165d837c98c23ab0952303a1ac28 (diff) | |
| parent | 34d263270e43f650953538d95f5dd2857baeeb10 (diff) | |
| download | CMake-d6bfce26ad59086282c27b090cefa00ccdeed7e7.zip CMake-d6bfce26ad59086282c27b090cefa00ccdeed7e7.tar.gz CMake-d6bfce26ad59086282c27b090cefa00ccdeed7e7.tar.bz2 | |
Merge branch 'help-try-compile-result-var' into release-3.20
Merge-request: !6923
| -rw-r--r-- | Help/command/try_compile.rst | 8 | ||||
| -rw-r--r-- | Help/command/try_run.rst | 5 |
2 files changed, 0 insertions, 13 deletions
diff --git a/Help/command/try_compile.rst b/Help/command/try_compile.rst index 06da910..08f8d5b 100644 --- a/Help/command/try_compile.rst +++ b/Help/command/try_compile.rst @@ -19,10 +19,6 @@ Try Compiling Whole Projects Try building a project. The success or failure of the ``try_compile``, i.e. ``TRUE`` or ``FALSE`` respectively, is returned in ``<resultVar>``. -.. versionadded:: 3.14 - The name of the ``<resultVar>`` is defined by the user. Previously, it had - a fixed name ``RESULT_VAR``. - In this form, ``<srcdir>`` should contain a complete CMake project with a ``CMakeLists.txt`` file and all sources. The ``<bindir>`` and ``<srcdir>`` will not be deleted after this command is run. Specify ``<targetName>`` to @@ -51,10 +47,6 @@ Try building an executable or static library from one or more source files variable). The success or failure of the ``try_compile``, i.e. ``TRUE`` or ``FALSE`` respectively, is returned in ``<resultVar>``. -.. versionadded:: 3.14 - The name of the ``<resultVar>`` is defined by the user. Previously, it had - a fixed name ``RESULT_VAR``. - In this form, one or more source files must be provided. If :variable:`CMAKE_TRY_COMPILE_TARGET_TYPE` is unset or is set to ``EXECUTABLE``, the sources must include a definition for ``main`` and CMake will create a diff --git a/Help/command/try_run.rst b/Help/command/try_run.rst index 404de98..fc41cdd 100644 --- a/Help/command/try_run.rst +++ b/Help/command/try_run.rst @@ -30,11 +30,6 @@ executable was built, but failed to run, then ``<runResultVar>`` will be set to ``FAILED_TO_RUN``. See the :command:`try_compile` command for information on how the test project is constructed to build the source file. -.. versionadded:: 3.14 - The names of the result variables ``<runResultVar>`` and - ``<compileResultVar>`` are defined by the user. Previously, they had - fixed names ``RUN_RESULT_VAR`` and ``COMPILE_RESULT_VAR``. - The options are: ``CMAKE_FLAGS <flags>...`` |