diff options
| author | Brad King <brad.king@kitware.com> | 2019-01-29 14:15:31 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-01-29 14:15:44 (GMT) |
| commit | 5134e11ee4291c1eb53aa5014af2af75a2e33f3b (patch) | |
| tree | efe6fb3027892959ab723805bca025adbc4a5564 /Tests/Tutorial/Step3/MathFunctions | |
| parent | fa7077e7411f4f85724deae3427acb29be729567 (diff) | |
| parent | 0e2cdacf7b51c915acd1a2a9e58a080d2667b4cb (diff) | |
| download | CMake-5134e11ee4291c1eb53aa5014af2af75a2e33f3b.zip CMake-5134e11ee4291c1eb53aa5014af2af75a2e33f3b.tar.gz CMake-5134e11ee4291c1eb53aa5014af2af75a2e33f3b.tar.bz2 | |
Merge topic 'update-tutorial'
0e2cdacf7b Tests: Update style of c++ code snippets in Tutorial directions
f2ddedfa58 Tests: Update CMake tutorial
438651506a Tests: Make ExternalProjectLocal independent of Tutorial directory
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2731
Diffstat (limited to 'Tests/Tutorial/Step3/MathFunctions')
| -rw-r--r-- | Tests/Tutorial/Step3/MathFunctions/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | Tests/Tutorial/Step3/MathFunctions/mysqrt.cxx | 13 |
2 files changed, 5 insertions, 11 deletions
diff --git a/Tests/Tutorial/Step3/MathFunctions/CMakeLists.txt b/Tests/Tutorial/Step3/MathFunctions/CMakeLists.txt index f386036..8b443a6 100644 --- a/Tests/Tutorial/Step3/MathFunctions/CMakeLists.txt +++ b/Tests/Tutorial/Step3/MathFunctions/CMakeLists.txt @@ -1,4 +1 @@ add_library(MathFunctions mysqrt.cxx) - -install (TARGETS MathFunctions DESTINATION bin) -install (FILES MathFunctions.h DESTINATION include) diff --git a/Tests/Tutorial/Step3/MathFunctions/mysqrt.cxx b/Tests/Tutorial/Step3/MathFunctions/mysqrt.cxx index 2710f92..7d9379e 100644 --- a/Tests/Tutorial/Step3/MathFunctions/mysqrt.cxx +++ b/Tests/Tutorial/Step3/MathFunctions/mysqrt.cxx @@ -1,5 +1,5 @@ #include "MathFunctions.h" -#include <stdio.h> +#include <iostream> // a hack square root calculation using simple operations double mysqrt(double x) @@ -8,19 +8,16 @@ double mysqrt(double x) return 0; } - double result; - double delta; - result = x; + double result = x; // do ten iterations - int i; - for (i = 0; i < 10; ++i) { + for (int i = 0; i < 10; ++i) { if (result <= 0) { result = 0.1; } - delta = x - (result * result); + double delta = x - (result * result); result = result + 0.5 * delta / result; - fprintf(stdout, "Computing sqrt of %g to be %g\n", x, result); + std::cout << "Computing sqrt of " << x << " to be " << result << std::endl; } return result; } |
