|
|
commit 556e895dc1b2befe84ad0959313799993957a7de
Author: Albrecht Schlosser <albrechts.fltk@online.de>
AuthorDate: Mon Apr 26 15:01:05 2021 +0200
Commit: Albrecht Schlosser <albrechts.fltk@online.de>
CommitDate: Mon Apr 26 15:03:00 2021 +0200
CMake: Document FLTKConfig.cmake and set FLTK_INCLUDE_DIR
Some of the output variables had not been documented, and the "new"
variable for FLTK include directories is 'FLTK_INCLUDE_DIRS' (plural)
rather than 'FLTK_INCLUDE_DIR'.
FLTK_INCLUDE_DIR is now also set for compatibility with FindFLTK.cmake
supplied by CMake.
CMake/FLTKConfig.cmake.in | 27 +++++++++++++++++++++------
1 file changed, 21 insertions(+), 6 deletions(-)
diff --git CMake/FLTKConfig.cmake.in CMake/FLTKConfig.cmake.in
index 2cc9d8f..e2de914 100644
--- CMake/FLTKConfig.cmake.in
+++ CMake/FLTKConfig.cmake.in
@@ -6,14 +6,25 @@
#
# It defines the following variables:
#
-# FLTK_INCLUDE_DIRS - FLTK include directories
-# FLTK_LIBRARIES - list of FLTK libraries built (not yet implemented)
-# FLTK_FLUID_EXECUTABLE - needed by the function FLTK_RUN_FLUID
+# FLTK_VERSION - FLTK version string ("x.y.z")
+# FLTK_INCLUDE_DIRS - FLTK include directories
+# FLTK_LIBRARIES - list of FLTK libraries built (not yet implemented)
+# FLTK_FLUID_EXECUTABLE - needed by the function FLTK_RUN_FLUID
# (or the deprecated fltk_wrap_ui() CMake command)
#
-# FLTK_USE_FILE - previously used to set things up to use FLTK
-# - deprecated since FLTK 1.3.4
-# - will be removed in FLTK 1.4.0 or later
+# It defines the following deprecated variables for backwards
+# compatibility (do not use for new projects):
+#
+# FLTK_INCLUDE_DIR - FLTK include directories (same as FLTK_INCLUDE_DIRS)
+#
+# FLTK_USE_FILE - previously used to set things up to use FLTK
+# - deprecated since FLTK 1.3.4
+# - will be removed in FLTK 1.4.0 or later
+#
+# Important note: FLTK's CMake build files are not yet complete and may be
+# changed in future versions. This includes the list of defined variables
+# above that may be changed if necessary.
+#
set (FLTK_VERSION @FLTK_VERSION@)
@@ -22,6 +33,10 @@ include (${CMAKE_CURRENT_LIST_DIR}/FLTK-Targets.cmake)
set (FLTK_INCLUDE_DIRS "@INCLUDE_DIRS@")
set (FLTK_USE_FILE ${CMAKE_CURRENT_LIST_DIR}/UseFLTK.cmake)
+# for compatibility with CMake's FindFLTK.cmake
+
+set (FLTK_INCLUDE_DIR "${FLTK_INCLUDE_DIRS}")
+
if (CMAKE_CROSSCOMPILING)
find_file(FLUID_PATH
NAMES fluid fluid.exe
[ Direct Link to Message ] | |
|
| |