瀏覽代碼

Merge topic 'fltk_re-entrant'

51fd21736b FindFLTK: Safe to include multiple times

Acked-by: Kitware Robot <[email protected]>
Merge-request: !6519
Brad King 4 年之前
父節點
當前提交
c9a29ce55d
共有 1 個文件被更改,包括 8 次插入4 次删除
  1. 8 4
      Modules/FindFLTK.cmake

+ 8 - 4
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)