diff options
| author | Brad King <brad.king@kitware.com> | 2021-09-15 14:17:58 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-09-15 14:18:06 (GMT) |
| commit | c9a29ce55d7af9980e866a98a3c81b5f4edb89b0 (patch) | |
| tree | 89694aa6eae4d04277d92856a87ffd9ce8d753fa | |
| parent | 49fb755302299a60347116f514e566f57f5609da (diff) | |
| parent | 51fd21736b10e2fa04382c5aa71f2044d31e362f (diff) | |
| download | CMake-c9a29ce55d7af9980e866a98a3c81b5f4edb89b0.zip CMake-c9a29ce55d7af9980e866a98a3c81b5f4edb89b0.tar.gz CMake-c9a29ce55d7af9980e866a98a3c81b5f4edb89b0.tar.bz2 | |
Merge topic 'fltk_re-entrant'
51fd21736b FindFLTK: Safe to include multiple times
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6519
| -rw-r--r-- | Modules/FindFLTK.cmake | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Modules/FindFLTK.cmake b/Modules/FindFLTK.cmake index bab7256..d54d2f6 100644 --- a/Modules/FindFLTK.cmake +++ b/Modules/FindFLTK.cmake @@ -152,13 +152,17 @@ if(NOT FLTK_DIR) endif() # Check if FLTK was built using CMake -if(EXISTS ${FLTK_DIR}/FLTKConfig.cmake) - set(FLTK_BUILT_WITH_CMAKE 1) -endif() +foreach(fltk_include IN LISTS FLTK_DIR) + if(EXISTS "${fltk_include}/FLTKConfig.cmake") + set(FLTK_BUILT_WITH_CMAKE 1) + set(FLTK_CMAKE_PATH "${fltk_include}/FLTKConfig.cmake") + break() + endif() +endforeach() if(FLTK_BUILT_WITH_CMAKE) set(FLTK_FOUND 1) - include(${FLTK_DIR}/FLTKConfig.cmake) + include("${FLTK_CMAKE_PATH}") # Fluid if(FLUID_COMMAND) |