summaryrefslogtreecommitdiffstats
path: root/Help/guide/tutorial/Adding Generator Expressions.rst
diff options
context:
space:
mode:
authorMarkus Ferrell <markus.ferrell@kitware.com>2022-07-20 17:24:40 (GMT)
committerMarkus Ferrell <markus.ferrell@kitware.com>2022-08-08 21:15:48 (GMT)
commitccba87b05b022cc021580b65ae51bbae0002fadb (patch)
treee90c94d2bb65845b23c483dae801cfbd8cf498d3 /Help/guide/tutorial/Adding Generator Expressions.rst
parentad20e7b2ae6e698b6778f0572f1a03fdf1fcacda (diff)
downloadCMake-ccba87b05b022cc021580b65ae51bbae0002fadb.zip
CMake-ccba87b05b022cc021580b65ae51bbae0002fadb.tar.gz
CMake-ccba87b05b022cc021580b65ae51bbae0002fadb.tar.bz2
Tutorial: Move step 10 to step 4
Shifts steps 4-9 to 5-10.
Diffstat (limited to 'Help/guide/tutorial/Adding Generator Expressions.rst')
-rw-r--r--Help/guide/tutorial/Adding Generator Expressions.rst12
1 files changed, 6 insertions, 6 deletions
diff --git a/Help/guide/tutorial/Adding Generator Expressions.rst b/Help/guide/tutorial/Adding Generator Expressions.rst
index 7fcc97f..0efce8d 100644
--- a/Help/guide/tutorial/Adding Generator Expressions.rst
+++ b/Help/guide/tutorial/Adding Generator Expressions.rst
@@ -1,4 +1,4 @@
-Step 10: Adding Generator Expressions
+Step 4: Adding Generator Expressions
=====================================
:manual:`Generator expressions <cmake-generator-expressions(7)>` are evaluated
@@ -37,16 +37,16 @@ instead of using :variable:`CMAKE_CXX_STANDARD`.
So the following code:
-.. literalinclude:: Step10/CMakeLists.txt
+.. literalinclude:: Step4/CMakeLists.txt
:caption: CMakeLists.txt
:name: CMakeLists.txt-CXX_STANDARD-variable-remove
:language: cmake
:start-after: project(Tutorial VERSION 1.0)
- :end-before: # control where the static and shared libraries are built so that on windows
+ :end-before: # should we use our own math functions
Would be replaced with:
-.. literalinclude:: Step11/CMakeLists.txt
+.. literalinclude:: Step5/CMakeLists.txt
:caption: CMakeLists.txt
:name: CMakeLists.txt-cxx_std-feature
:language: cmake
@@ -69,12 +69,12 @@ warning flags vary based on the compiler we use the ``COMPILE_LANG_AND_ID``
generator expression to control which flags to apply given a language and a set
of compiler ids as seen below:
-.. literalinclude:: Step11/CMakeLists.txt
+.. literalinclude:: Step5/CMakeLists.txt
:caption: CMakeLists.txt
:name: CMakeLists.txt-target_compile_options-genex
:language: cmake
:start-after: # the BUILD_INTERFACE genex
- :end-before: # control where the static and shared libraries are built so that on windows
+ :end-before: # should we use our own math functions
Looking at this we see that the warning flags are encapsulated inside a
``BUILD_INTERFACE`` condition. This is done so that consumers of our installed