diff options
| author | Betsy McPhail <betsy.mcphail@kitware.com> | 2019-07-09 17:21:40 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-08-19 15:48:58 (GMT) |
| commit | 82332f81bbb0609bf521d29c36b3ecf1566be892 (patch) | |
| tree | 5ec58581dcc9e85f34c57efd013e7932e21d889d /Help/guide/tutorial/Step7 | |
| parent | 1996e0157826903f27f73825a01f83d53dc8fba4 (diff) | |
| download | CMake-82332f81bbb0609bf521d29c36b3ecf1566be892.zip CMake-82332f81bbb0609bf521d29c36b3ecf1566be892.tar.gz CMake-82332f81bbb0609bf521d29c36b3ecf1566be892.tar.bz2 | |
Tutorial: Improve Step 1
* Update minimum required version to 3.10
* Use VERSION argument to project command rather than separate variables
* Replace `endif(USE_MYMATH)` with more modern `endif()`
* Simplify the call to 'configure_file()'
* Add comments to tutorial.cxx to use as anchors in documentation
* Remove CMakeLists and TutorialConfig.h.in files that users should
create. Consequently, remove Step1 from CMake tests.
Diffstat (limited to 'Help/guide/tutorial/Step7')
| -rw-r--r-- | Help/guide/tutorial/Step7/CMakeLists.txt | 18 | ||||
| -rw-r--r-- | Help/guide/tutorial/Step7/tutorial.cxx | 7 |
2 files changed, 11 insertions, 14 deletions
diff --git a/Help/guide/tutorial/Step7/CMakeLists.txt b/Help/guide/tutorial/Step7/CMakeLists.txt index a1efa77..b251aaf 100644 --- a/Help/guide/tutorial/Step7/CMakeLists.txt +++ b/Help/guide/tutorial/Step7/CMakeLists.txt @@ -1,13 +1,12 @@ -cmake_minimum_required(VERSION 3.3) -project(Tutorial) +cmake_minimum_required(VERSION 3.10) +# set the project name and version +project(Tutorial VERSION 1.0) + +# specify the C++ standard set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD_REQUIRED True) -# set the version number -set(Tutorial_VERSION_MAJOR 1) -set(Tutorial_VERSION_MINOR 0) - # does this system provide the log and exp functions? include(CheckSymbolExists) set(CMAKE_REQUIRED_LIBRARIES "m") @@ -19,16 +18,13 @@ option(USE_MYMATH "Use tutorial provided math implementation" ON) # configure a header file to pass some of the CMake settings # to the source code -configure_file( - "${PROJECT_SOURCE_DIR}/TutorialConfig.h.in" - "${PROJECT_BINARY_DIR}/TutorialConfig.h" - ) +configure_file(TutorialConfig.h.in TutorialConfig.h) # add the MathFunctions library? if(USE_MYMATH) add_subdirectory(MathFunctions) list(APPEND EXTRA_LIBS MathFunctions) -endif(USE_MYMATH) +endif() # add the executable add_executable(Tutorial tutorial.cxx) diff --git a/Help/guide/tutorial/Step7/tutorial.cxx b/Help/guide/tutorial/Step7/tutorial.cxx index 8156a9c..b3c6a4f 100644 --- a/Help/guide/tutorial/Step7/tutorial.cxx +++ b/Help/guide/tutorial/Step7/tutorial.cxx @@ -20,13 +20,14 @@ int main(int argc, char* argv[]) return 1; } - double inputValue = std::stod(argv[1]); + // convert input to double + const double inputValue = std::stod(argv[1]); // which square root function should we use? #ifdef USE_MYMATH - double outputValue = mysqrt(inputValue); + const double outputValue = mysqrt(inputValue); #else - double outputValue = sqrt(inputValue); + const double outputValue = sqrt(inputValue); #endif std::cout << "The square root of " << inputValue << " is " << outputValue |