diff options
| author | Betsy McPhail <betsy.mcphail@kitware.com> | 2019-07-02 00:58:32 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-08-19 15:49:05 (GMT) |
| commit | 49ce4d6ff4e70026ab1da6da91d7965ef61863ab (patch) | |
| tree | d519e2a2f16f1ebc0ae447e5b98860403f42bc39 /Help/guide/tutorial/Step10 | |
| parent | 82332f81bbb0609bf521d29c36b3ecf1566be892 (diff) | |
| download | CMake-49ce4d6ff4e70026ab1da6da91d7965ef61863ab.zip CMake-49ce4d6ff4e70026ab1da6da91d7965ef61863ab.tar.gz CMake-49ce4d6ff4e70026ab1da6da91d7965ef61863ab.tar.bz2 | |
Tutorial: Improve Step 2
* Fix typo in #include
* Remove CMakeLists file that users should create
* Clarify which files users are expected to create
* Highlight the importance of configuring TutorialConfig.h.in after
the MY_MATH option has been set
Diffstat (limited to 'Help/guide/tutorial/Step10')
| -rw-r--r-- | Help/guide/tutorial/Step10/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Help/guide/tutorial/Step10/MathFunctions/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | Help/guide/tutorial/Step10/TutorialConfig.h.in | 2 |
3 files changed, 2 insertions, 8 deletions
diff --git a/Help/guide/tutorial/Step10/CMakeLists.txt b/Help/guide/tutorial/Step10/CMakeLists.txt index d163936..6a59104 100644 --- a/Help/guide/tutorial/Step10/CMakeLists.txt +++ b/Help/guide/tutorial/Step10/CMakeLists.txt @@ -23,7 +23,7 @@ add_subdirectory(MathFunctions) # add the executable add_executable(Tutorial tutorial.cxx) -target_link_libraries(Tutorial MathFunctions) +target_link_libraries(Tutorial PUBLIC MathFunctions) # add the binary tree to the search path for include files # so that we will find TutorialConfig.h diff --git a/Help/guide/tutorial/Step10/MathFunctions/CMakeLists.txt b/Help/guide/tutorial/Step10/MathFunctions/CMakeLists.txt index aafd090..0ef67f1 100644 --- a/Help/guide/tutorial/Step10/MathFunctions/CMakeLists.txt +++ b/Help/guide/tutorial/Step10/MathFunctions/CMakeLists.txt @@ -43,12 +43,6 @@ if(USE_MYMATH) POSITION_INDEPENDENT_CODE ${BUILD_SHARED_LIBS} ) - target_compile_definitions(MathFunctions PRIVATE "USE_MYMATH") - if(HAVE_LOG AND HAVE_EXP) - target_compile_definitions(SqrtLibrary - PRIVATE "HAVE_LOG" "HAVE_EXP") - endif() - target_link_libraries(MathFunctions PRIVATE SqrtLibrary) endif() diff --git a/Help/guide/tutorial/Step10/TutorialConfig.h.in b/Help/guide/tutorial/Step10/TutorialConfig.h.in index 8cd2fc9..7e4d7fa 100644 --- a/Help/guide/tutorial/Step10/TutorialConfig.h.in +++ b/Help/guide/tutorial/Step10/TutorialConfig.h.in @@ -1,3 +1,3 @@ -// the configured version number +// the configured options and settings for Tutorial #define Tutorial_VERSION_MAJOR @Tutorial_VERSION_MAJOR@ #define Tutorial_VERSION_MINOR @Tutorial_VERSION_MINOR@ |