mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CMake: Remove UseFLTK.cmake generation and usage

Browse Source
This commit is contained in:
Albrecht Schlosser 2023-12-03 17:16:11 +01:00
parent a6927779c3
commit 63c54fe7c8
6 changed files with 6 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -9,15 +9,13 @@
*.o *.o
**/.DS_Store **/.DS_Store
# CMake build artifacts if built in source - not recommended, but anyway # CMake build artifacts if built in source - strongly discouraged!
bin/ bin/
**/cmake_install.cmake **/cmake_install.cmake
**/CMakeCache.txt **/CMakeCache.txt
**/CMakeFiles/ **/CMakeFiles/
etc/UseFLTK.cmake
cmake_uninstall.cmake cmake_uninstall.cmake
UseFLTK.cmake
FLTK.sln FLTK.sln
FLTK-Targets.cmake FLTK-Targets.cmake
FLTKConfig.cmake FLTKConfig.cmake

7
CMake/FLTKConfig.cmake.in
View File

@ -2,7 +2,7 @@
# FLTKConfig.cmake - FLTK CMake configuration file for external projects. # FLTKConfig.cmake - FLTK CMake configuration file for external projects.
# #
# This file is generated by CMake and used to load FLTK's settings for # This file is generated by CMake and used to load FLTK's settings for
# an external project. # an external project, i.e. a project using FLTK.
# #
# It defines the following variables: # It defines the following variables:
# #
@ -17,10 +17,6 @@
# #
# FLTK_INCLUDE_DIR - FLTK include directories (same as FLTK_INCLUDE_DIRS) # 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 # 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 # changed in future versions. This includes the list of defined variables
# above that may be changed if necessary. # above that may be changed if necessary.
@ -31,7 +27,6 @@ set (FLTK_VERSION @FLTK_VERSION@)
include (${CMAKE_CURRENT_LIST_DIR}/FLTK-Targets.cmake) include (${CMAKE_CURRENT_LIST_DIR}/FLTK-Targets.cmake)
set (FLTK_INCLUDE_DIRS "@INCLUDE_DIRS@") set (FLTK_INCLUDE_DIRS "@INCLUDE_DIRS@")
set (FLTK_USE_FILE ${CMAKE_CURRENT_LIST_DIR}/UseFLTK.cmake)
# for compatibility with CMake's FindFLTK.cmake # for compatibility with CMake's FindFLTK.cmake

15
CMake/UseFLTK.cmake.in
View File

@ -1,15 +0,0 @@
#
# UseFLTK.CMake - FLTK CMake environment configuration file for external projects.
#
# This file is deprecated and will be removed in FLTK 1.4.0 or later
#
# automatically generated - do not edit
#
include_directories("@FLTK_INCLUDE_DIRS@")
message(AUTHOR_WARNING
" * Warning: UseFLTK.cmake is deprecated and will be removed in FLTK 1.4.0
* or later. Please use 'include_directories(\${FLTK_INCLUDE_DIRS})' or
* 'target_include_directories(<target> PUBLIC|PRIVATE \${FLTK_INCLUDE_DIRS})'
* instead of 'include(\${FLTK_USE_FILE})'.")

7
CMake/export.cmake
View File

@ -64,13 +64,6 @@ configure_file(
@ONLY @ONLY
) )
# generate UseFLTK.cmake for build directory use
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/CMake/UseFLTK.cmake.in
${CMAKE_CURRENT_BINARY_DIR}/UseFLTK.cmake
@ONLY
)
# generate fltk-config for build directory use # generate fltk-config for build directory use
set (prefix ${CMAKE_CURRENT_BINARY_DIR}) set (prefix ${CMAKE_CURRENT_BINARY_DIR})
set (exec_prefix "\${prefix}") set (exec_prefix "\${prefix}")

13
CMake/install.cmake
View File

@ -77,19 +77,8 @@ install (FILES
DESTINATION ${FLTK_CONFIG_PATH} DESTINATION ${FLTK_CONFIG_PATH}
) )
configure_file( # Generate fltk-config
${CMAKE_CURRENT_SOURCE_DIR}/CMake/UseFLTK.cmake.in
${CMAKE_CURRENT_BINARY_DIR}/etc/UseFLTK.cmake
@ONLY
)
# Deprecated: install UseFLTK.cmake with deprecation warnings only
install (FILES
${CMAKE_CURRENT_BINARY_DIR}/etc/UseFLTK.cmake
DESTINATION ${FLTK_CONFIG_PATH}
)
# generate fltk-config
set (prefix ${CMAKE_INSTALL_PREFIX}) set (prefix ${CMAKE_INSTALL_PREFIX})
set (exec_prefix "\${prefix}") set (exec_prefix "\${prefix}")
set (includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}") set (includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")

6
README.CMake.txt
View File

@ -608,8 +608,8 @@ The target_link_libraries() command is used to specify all necessary FLTK
libraries. Thus, you may have to add fltk_images, fltk_gl, etc… libraries. Thus, you may have to add fltk_images, fltk_gl, etc…
Note: the variable FLTK_USE_FILE used to include another file in Note: the variable FLTK_USE_FILE used to include another file in
previous FLTK versions was deprecated since FLTK 1.3.4 and will be previous FLTK versions was deprecated since FLTK 1.3.4 and has been
removed in FLTK 1.4.0 (this version) or later (maybe 1.4.1 or 1.4.2). removed in FLTK 1.4.0.
3.3 Building a Program Using Fluid Files 3.3 Building a Program Using Fluid Files
@ -714,7 +714,7 @@ May 15 2013 - erco: small formatting tweaks, added some examples
Feb 23 2014 - msurette: updated to reflect changes to the CMake files Feb 23 2014 - msurette: updated to reflect changes to the CMake files
Apr 07 2015 - AlbrechtS: update use example and more docs Apr 07 2015 - AlbrechtS: update use example and more docs
Jan 31 2016 - msurette: custom command instead of fltk_wrap_ui Jan 31 2016 - msurette: custom command instead of fltk_wrap_ui
Nov 01 2016 - AlbrechtS: remove deprecated FLTK_USE_FILE, add MinGW build Nov 01 2016 - AlbrechtS: add MinGW build
Jul 05 2017 - matt: added instructions for macOS and Xcode Jul 05 2017 - matt: added instructions for macOS and Xcode
Dec 29 2018 - AlbrechtS: add documentation option descriptions Dec 29 2018 - AlbrechtS: add documentation option descriptions
Apr 29 2021 - AlbrechtS: document macOS "universal apps" build setup Apr 29 2021 - AlbrechtS: document macOS "universal apps" build setup