summaryrefslogtreecommitdiffstats
path: root/Modules/FindFontconfig.cmake
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-03-26 17:44:52 (GMT)
committerBrad King <brad.king@kitware.com>2019-03-26 18:14:09 (GMT)
commita3a1e69f8a8e6571bbb8c9257b401f04c22bd1e2 (patch)
tree85da4b56082686a8bfaea0c61fb855dc3197707c /Modules/FindFontconfig.cmake
parentbf02d625325535f485512eba307cff54c08bb257 (diff)
downloadCMake-a3a1e69f8a8e6571bbb8c9257b401f04c22bd1e2.zip
CMake-a3a1e69f8a8e6571bbb8c9257b401f04c22bd1e2.tar.gz
CMake-a3a1e69f8a8e6571bbb8c9257b401f04c22bd1e2.tar.bz2
FindFontconfig: Convert module variables to camel case
Our documented standard for find module variable names is to match the case of the find module package name. This was overlooked when the module was added by commit 84e7920b3a (FindFontconfig: Add module to find Fontconfig, 2018-09-27, v3.14.0-rc1~523^2). The module was released with the upper case names in CMake 3.14.0, so fix it to have camel case names in 3.14.1. This is incompatible but anyone using a given release series should be using the latest patch on it and we've made breaking fixups on newly released features like this before. Reported-by: Christophe Giboudeaux <christophe@krop.fr> Fixes: #19094
Diffstat (limited to 'Modules/FindFontconfig.cmake')
-rw-r--r--Modules/FindFontconfig.cmake56
1 files changed, 28 insertions, 28 deletions
diff --git a/Modules/FindFontconfig.cmake b/Modules/FindFontconfig.cmake
index 96e1e76..a6f0180 100644
--- a/Modules/FindFontconfig.cmake
+++ b/Modules/FindFontconfig.cmake
@@ -18,15 +18,15 @@ Result Variables
This will define the following variables in your project:
-``FONTCONFIG_FOUND``
+``Fontconfig_FOUND``
true if (the requested version of) Fontconfig is available.
-``FONTCONFIG_VERSION``
+``Fontconfig_VERSION``
the version of Fontconfig.
-``FONTCONFIG_LIBRARIES``
+``Fontconfig_LIBRARIES``
the libraries to link against to use Fontconfig.
-``FONTCONFIG_INCLUDE_DIRS``
+``Fontconfig_INCLUDE_DIRS``
where to find the Fontconfig headers.
-``FONTCONFIG_COMPILE_OPTIONS``
+``Fontconfig_COMPILE_OPTIONS``
this should be passed to target_compile_options(), if the
target is not used for linking
@@ -37,10 +37,10 @@ This will define the following variables in your project:
# in the FIND_PATH() and FIND_LIBRARY() calls
find_package(PkgConfig QUIET)
pkg_check_modules(PKG_FONTCONFIG QUIET fontconfig)
-set(FONTCONFIG_COMPILE_OPTIONS ${PKG_FONTCONFIG_CFLAGS_OTHER})
-set(FONTCONFIG_VERSION ${PKG_FONTCONFIG_VERSION})
+set(Fontconfig_COMPILE_OPTIONS ${PKG_FONTCONFIG_CFLAGS_OTHER})
+set(Fontconfig_VERSION ${PKG_FONTCONFIG_VERSION})
-find_path( FONTCONFIG_INCLUDE_DIR
+find_path( Fontconfig_INCLUDE_DIR
NAMES
fontconfig/fontconfig.h
HINTS
@@ -48,24 +48,24 @@ find_path( FONTCONFIG_INCLUDE_DIR
/usr/X11/include
)
-find_library( FONTCONFIG_LIBRARY
+find_library( Fontconfig_LIBRARY
NAMES
fontconfig
PATHS
${PKG_FONTCONFIG_LIBRARY_DIRS}
)
-if (FONTCONFIG_INCLUDE_DIR AND NOT FONTCONFIG_VERSION)
- file(STRINGS ${FONTCONFIG_INCLUDE_DIR}/fontconfig/fontconfig.h _contents REGEX "^#define[ \t]+FC_[A-Z]+[ \t]+[0-9]+$")
- unset(FONTCONFIG_VERSION)
+if (Fontconfig_INCLUDE_DIR AND NOT Fontconfig_VERSION)
+ file(STRINGS ${Fontconfig_INCLUDE_DIR}/fontconfig/fontconfig.h _contents REGEX "^#define[ \t]+FC_[A-Z]+[ \t]+[0-9]+$")
+ unset(Fontconfig_VERSION)
foreach(VPART MAJOR MINOR REVISION)
foreach(VLINE ${_contents})
if(VLINE MATCHES "^#define[\t ]+FC_${VPART}[\t ]+([0-9]+)$")
- set(FONTCONFIG_VERSION_PART "${CMAKE_MATCH_1}")
- if(FONTCONFIG_VERSION)
- string(APPEND FONTCONFIG_VERSION ".${FONTCONFIG_VERSION_PART}")
+ set(Fontconfig_VERSION_PART "${CMAKE_MATCH_1}")
+ if(Fontconfig_VERSION)
+ string(APPEND Fontconfig_VERSION ".${Fontconfig_VERSION_PART}")
else()
- set(FONTCONFIG_VERSION "${FONTCONFIG_VERSION_PART}")
+ set(Fontconfig_VERSION "${Fontconfig_VERSION_PART}")
endif()
endif()
endforeach()
@@ -75,27 +75,27 @@ endif ()
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Fontconfig
FOUND_VAR
- FONTCONFIG_FOUND
+ Fontconfig_FOUND
REQUIRED_VARS
- FONTCONFIG_LIBRARY
- FONTCONFIG_INCLUDE_DIR
+ Fontconfig_LIBRARY
+ Fontconfig_INCLUDE_DIR
VERSION_VAR
- FONTCONFIG_VERSION
+ Fontconfig_VERSION
)
-if(FONTCONFIG_FOUND AND NOT TARGET Fontconfig::Fontconfig)
+if(Fontconfig_FOUND AND NOT TARGET Fontconfig::Fontconfig)
add_library(Fontconfig::Fontconfig UNKNOWN IMPORTED)
set_target_properties(Fontconfig::Fontconfig PROPERTIES
- IMPORTED_LOCATION "${FONTCONFIG_LIBRARY}"
- INTERFACE_COMPILE_OPTIONS "${FONTCONFIG_COMPILE_OPTIONS}"
- INTERFACE_INCLUDE_DIRECTORIES "${FONTCONFIG_INCLUDE_DIR}"
+ IMPORTED_LOCATION "${Fontconfig_LIBRARY}"
+ INTERFACE_COMPILE_OPTIONS "${Fontconfig_COMPILE_OPTIONS}"
+ INTERFACE_INCLUDE_DIRECTORIES "${Fontconfig_INCLUDE_DIR}"
)
endif()
-mark_as_advanced(FONTCONFIG_LIBRARY FONTCONFIG_INCLUDE_DIR)
+mark_as_advanced(Fontconfig_LIBRARY Fontconfig_INCLUDE_DIR)
-if(FONTCONFIG_FOUND)
- set(FONTCONFIG_LIBRARIES ${FONTCONFIG_LIBRARY})
- set(FONTCONFIG_INCLUDE_DIRS ${FONTCONFIG_INCLUDE_DIR})
+if(Fontconfig_FOUND)
+ set(Fontconfig_LIBRARIES ${Fontconfig_LIBRARY})
+ set(Fontconfig_INCLUDE_DIRS ${Fontconfig_INCLUDE_DIR})
endif()