diff options
| author | Brad King <brad.king@kitware.com> | 2022-10-27 13:39:54 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-10-27 13:40:31 (GMT) |
| commit | a7adece91125e7ddb089e17c20b3c7edbadf1b48 (patch) | |
| tree | caa8b69e4812e687fbc250d702b23d9dcb420041 /Help/guide/tutorial/Step2 | |
| parent | 95373fd3845e195753fb8246f1efa895c5304b89 (diff) | |
| parent | 277fbb3035cbf5de118412172be307849a4315cb (diff) | |
| download | CMake-a7adece91125e7ddb089e17c20b3c7edbadf1b48.zip CMake-a7adece91125e7ddb089e17c20b3c7edbadf1b48.tar.gz CMake-a7adece91125e7ddb089e17c20b3c7edbadf1b48.tar.bz2 | |
Merge topic 'tutorial_my_math_consistency'
277fbb3035 Tutorial: Restore USE_MYMATH in place of MY_MATH
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7829
Diffstat (limited to 'Help/guide/tutorial/Step2')
| -rw-r--r-- | Help/guide/tutorial/Step2/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Help/guide/tutorial/Step2/TutorialConfig.h.in | 2 | ||||
| -rw-r--r-- | Help/guide/tutorial/Step2/tutorial.cxx | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Help/guide/tutorial/Step2/CMakeLists.txt b/Help/guide/tutorial/Step2/CMakeLists.txt index 2f7d56e..2b96128 100644 --- a/Help/guide/tutorial/Step2/CMakeLists.txt +++ b/Help/guide/tutorial/Step2/CMakeLists.txt @@ -7,7 +7,7 @@ project(Tutorial VERSION 1.0) set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD_REQUIRED True) -# TODO 7: Create a variable MY_MATH using option and set default to ON +# TODO 7: Create a variable USE_MYMATH using option and set default to ON # configure a header file to pass some of the CMake settings # to the source code diff --git a/Help/guide/tutorial/Step2/TutorialConfig.h.in b/Help/guide/tutorial/Step2/TutorialConfig.h.in index adb4c55..6c09e1a 100644 --- a/Help/guide/tutorial/Step2/TutorialConfig.h.in +++ b/Help/guide/tutorial/Step2/TutorialConfig.h.in @@ -2,4 +2,4 @@ #define Tutorial_VERSION_MAJOR @Tutorial_VERSION_MAJOR@ #define Tutorial_VERSION_MINOR @Tutorial_VERSION_MINOR@ -// TODO 13: use cmakedefine to define MY_MATH +// TODO 13: use cmakedefine to define USE_MYMATH diff --git a/Help/guide/tutorial/Step2/tutorial.cxx b/Help/guide/tutorial/Step2/tutorial.cxx index f83aa7e..87f5e0f 100644 --- a/Help/guide/tutorial/Step2/tutorial.cxx +++ b/Help/guide/tutorial/Step2/tutorial.cxx @@ -5,7 +5,7 @@ #include "TutorialConfig.h" -// TODO 11: Only include MathFunctions if MY_MATH is defined +// TODO 11: Only include MathFunctions if USE_MYMATH is defined // TODO 5: Include MathFunctions.h @@ -22,7 +22,7 @@ int main(int argc, char* argv[]) // convert input to double const double inputValue = std::stod(argv[1]); - // TODO 12: Use mysqrt if MY_MATH is defined and sqrt otherwise + // TODO 12: Use mysqrt if USE_MYMATH is defined and sqrt otherwise // TODO 6: Replace sqrt with mysqrt |