diff options
| author | Brad King <brad.king@kitware.com> | 2020-02-12 20:04:35 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-02-12 20:04:41 (GMT) |
| commit | b88a671f75bdd1cb4f24166a9a6d98a678de1e62 (patch) | |
| tree | f3337364bccad1325dcc5e8790ad1f7b7b584ae1 | |
| parent | 125f0451a9061c60036c5f92d104ee9fb3111a98 (diff) | |
| parent | c5d7c291375c6816770f9d951fb8dc690b1b4d38 (diff) | |
| download | CMake-b88a671f75bdd1cb4f24166a9a6d98a678de1e62.zip CMake-b88a671f75bdd1cb4f24166a9a6d98a678de1e62.tar.gz CMake-b88a671f75bdd1cb4f24166a9a6d98a678de1e62.tar.bz2 | |
Merge topic 'doc-ascii' into release-3.17
c5d7c29137 Help: Replace UTF-8 apostrophe with ascii apostrophe
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !4358
| -rw-r--r-- | Help/guide/tutorial/index.rst | 6 | ||||
| -rw-r--r-- | Modules/FindGLEW.cmake | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Help/guide/tutorial/index.rst b/Help/guide/tutorial/index.rst index 96f0486..a844cbf 100644 --- a/Help/guide/tutorial/index.rst +++ b/Help/guide/tutorial/index.rst @@ -183,7 +183,7 @@ last few lines of the top-level ``CMakeLists.txt`` file should now look like: ) Now let us make the MathFunctions library optional. While for the tutorial -there really isn’t any need to do so, for larger projects this is a common +there really isn't any need to do so, for larger projects this is a common occurrence. The first step is to add an option to the top-level ``CMakeLists.txt`` file. @@ -918,8 +918,8 @@ subbdirectories. The layout will look like: .. code-block:: none - Step12 - └── debug - └── release + - debug + - release Now we need to setup debug and release builds. We can use :variable:`CMAKE_BUILD_TYPE` to set the configuration type: diff --git a/Modules/FindGLEW.cmake b/Modules/FindGLEW.cmake index bd69819..27ffa13 100644 --- a/Modules/FindGLEW.cmake +++ b/Modules/FindGLEW.cmake @@ -10,7 +10,7 @@ Find the OpenGL Extension Wrangler Library (GLEW) Input Variables ^^^^^^^^^^^^^^^ -The following variables may be set to influence this module’s behavior: +The following variables may be set to influence this module's behavior: ``GLEW_USE_STATIC_LIBS`` to find and create :prop_tgt:`IMPORTED` target for static linkage. |