diff options
| author | Betsy McPhail <betsy.mcphail@kitware.com> | 2020-02-18 21:32:50 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-02-27 19:58:24 (GMT) |
| commit | 07223c5c27f60472db2125df647c7e1818aa01bc (patch) | |
| tree | 0f181ea2fb47e09bd08622d878d5fadc73655dba /Help | |
| parent | 21d72777fbbfcf2ab074f8f78838e487f144077d (diff) | |
| download | CMake-07223c5c27f60472db2125df647c7e1818aa01bc.zip CMake-07223c5c27f60472db2125df647c7e1818aa01bc.tar.gz CMake-07223c5c27f60472db2125df647c7e1818aa01bc.tar.bz2 | |
Tutorial: Update Step 5 to work on Windows
`log` and `exp` should be found on Windows systems now, as expected.
Update tests to be more specific in looking for the expected outcome of
the tutorial.
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/guide/tutorial/Step6/MathFunctions/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | Help/guide/tutorial/index.rst | 2 |
2 files changed, 12 insertions, 2 deletions
diff --git a/Help/guide/tutorial/Step6/MathFunctions/CMakeLists.txt b/Help/guide/tutorial/Step6/MathFunctions/CMakeLists.txt index 4bf6024..f64c6ac 100644 --- a/Help/guide/tutorial/Step6/MathFunctions/CMakeLists.txt +++ b/Help/guide/tutorial/Step6/MathFunctions/CMakeLists.txt @@ -8,10 +8,20 @@ target_include_directories(MathFunctions # does this system provide the log and exp functions? include(CheckSymbolExists) -set(CMAKE_REQUIRED_LIBRARIES "m") check_symbol_exists(log "math.h" HAVE_LOG) check_symbol_exists(exp "math.h" HAVE_EXP) +if(NOT (HAVE_LOG AND HAVE_EXP)) + unset(HAVE_LOG CACHE) + unset(HAVE_EXP CACHE) + set(CMAKE_REQUIRED_LIBRARIES "m") + check_symbol_exists(log "math.h" HAVE_LOG) + check_symbol_exists(exp "math.h" HAVE_EXP) + if(HAVE_LOG AND HAVE_EXP) + target_link_libraries(MathFunctions PRIVATE m) + endif() +endif() +# add compile definitions if(HAVE_LOG AND HAVE_EXP) target_compile_definitions(MathFunctions PRIVATE "HAVE_LOG" "HAVE_EXP") diff --git a/Help/guide/tutorial/index.rst b/Help/guide/tutorial/index.rst index a844cbf..4fbcd4c 100644 --- a/Help/guide/tutorial/index.rst +++ b/Help/guide/tutorial/index.rst @@ -386,7 +386,7 @@ these functions using the :module:`CheckSymbolExists` module in the top-level .. literalinclude:: Step6/MathFunctions/CMakeLists.txt :language: cmake :start-after: # does this system provide the log and exp functions? - :end-before: if(HAVE_LOG AND HAVE_EXP) + :end-before: # add compile definitions Now let's add these defines to ``TutorialConfig.h.in`` so that we can use them from ``mysqrt.cxx``: |