gre-ilya/fltk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename config header input files to better names

Browse Source 
Up to FLTK 1.4 we had two distinct input files for each header file:
one for configure and one for CMake. Since 1.5 we have only one input
file for each header which can now have a more appropriate name.

1) configh.cmake.in   -> config.h.in
2) fl_config.cmake.in -> fl_config.h.in
This commit is contained in:
Albrecht Schlosser 2025-05-05 14:52:02 +02:00
parent d7c705864e
commit 9ba11949ca
4 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMake/export.cmake
View File

@ -150,7 +150,7 @@ else(IS_ABSOLUTE "${FLTK_DOCDIR}")
set(PREFIX_DOC "${CMAKE_INSTALL_PREFIX}/${FLTK_DOCDIR}/fltk") set(PREFIX_DOC "${CMAKE_INSTALL_PREFIX}/${FLTK_DOCDIR}/fltk")
endif(IS_ABSOLUTE "${FLTK_DOCDIR}") endif(IS_ABSOLUTE "${FLTK_DOCDIR}")
set(CONFIG_H_IN configh.cmake.in) set(CONFIG_H_IN config.h.in)
set(CONFIG_H config.h) set(CONFIG_H config.h)
# generate config.h # generate config.h

2
CMakeLists.txt
View File

@ -267,7 +267,7 @@ include(CMake/variables.cmake)
include(CMake/export.cmake) include(CMake/export.cmake)
configure_file( configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/fl_config.cmake.in ${CMAKE_CURRENT_SOURCE_DIR}/fl_config.h.in
${CMAKE_CURRENT_BINARY_DIR}/FL/fl_config.h ${CMAKE_CURRENT_BINARY_DIR}/FL/fl_config.h
@ONLY @ONLY
) )

21
configh.cmake.in → config.h.in
View File

@ -1,8 +1,9 @@
/* @CONFIG_H@. Generated from @CONFIG_H_IN@ by CMake. */ /* @CONFIG_H@. Generated from @CONFIG_H_IN@ by CMake. */
/* /*
* Configuration file for the Fast Light Tool Kit (FLTK). * Configuration file for the Fast Light Tool Kit (FLTK). This file is used
* internally in the FLTK library and is not publicly available (not installed).
* *
* Copyright 1998-2024 by Bill Spitzak and others. * Copyright 1998-2025 by Bill Spitzak and others.
* *
* This library is free software. Distribution and use rights are outlined in * This library is free software. Distribution and use rights are outlined in
* the file "COPYING" which should have been included with this file. If this * the file "COPYING" which should have been included with this file. If this
@ -16,15 +17,17 @@
*/ */
/* /*
* Note: configure syntax vs. CMake syntax in source files (examples): * Note: CMake syntax in input file (examples):
* *
* configh.in configh.cmake.in * For instance in @CONFIG_H_IN@ (remove brackets for real syntax):
* --------------------- ---------------------------- * ----------------------------------------------------------------
* [#]define HAVE_GL 0 [#]cmakedefine01 HAVE_GL * [#]cmakedefine01 HAVE_GL
* [#]undef HAVE_SNPRINTF [#]cmakedefine HAVE_SNPRINTF 1 * [#]cmakedefine HAVE_SNPRINTF 1
* *
* The former defines the given macro either as 0 or 1, * The former defines HAVE_GL either as 0 or 1.
* the latter either does not define the macro or defines it as 1. *
* The latter either doesn't define HAVE_SNPRINTF or defines it as 1.
* The value (1 in the example) can be an arbitrary number or string.
*/ */
/* /*

7
fl_config.cmake.in → fl_config.h.in
View File

@ -1,8 +1,9 @@
/* FL/fl_config.h. Generated from fl_config.cmake.in by CMake. */ /* FL/fl_config.h. Generated from fl_config.h.in by CMake. */
/* /*
* Build configuration file for the Fast Light Tool Kit (FLTK). * Build configuration file for the Fast Light Tool Kit (FLTK). This
* configuration file is publicly accessible by user programs (installed).
* *
* Copyright 1998-2024 by Bill Spitzak and others. * Copyright 1998-2025 by Bill Spitzak and others.
* *
* This library is free software. Distribution and use rights are outlined in * This library is free software. Distribution and use rights are outlined in
* the file "COPYING" which should have been included with this file. If this * the file "COPYING" which should have been included with this file. If this