From a808bcabeb31ee1b5b1fded5af43a7cb0bb91f87 Mon Sep 17 00:00:00 2001 From: Matthew Fernandez Date: Tue, 1 Feb 2022 12:25:33 +1100 Subject: [PATCH] CMake: [nfc] uppercase 'PangoCairo_*' variables Upcoming changes that introduce `cmake-format` checks complain that these identifiers do not comply with `[A-Z][0-9A-Z_]+|_[0-9a-z_]+`. --- CMakeLists.txt | 2 +- ...dPangoCairo.cmake => FindPANGOCAIRO.cmake} | 40 +++++++++---------- plugin/pango/CMakeLists.txt | 8 ++-- 3 files changed, 25 insertions(+), 25 deletions(-) rename cmake/{FindPangoCairo.cmake => FindPANGOCAIRO.cmake} (71%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 684747250..71506c616 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -115,7 +115,7 @@ if(enable_ltdl) endif() endif() -find_package(PangoCairo) +find_package(PANGOCAIRO) if(with_zlib) find_package(ZLIB) diff --git a/cmake/FindPangoCairo.cmake b/cmake/FindPANGOCAIRO.cmake similarity index 71% rename from cmake/FindPangoCairo.cmake rename to cmake/FindPANGOCAIRO.cmake index df57a455c..b4576f494 100644 --- a/cmake/FindPangoCairo.cmake +++ b/cmake/FindPANGOCAIRO.cmake @@ -1,7 +1,7 @@ include(FindPackageHandleStandardArgs) if(WIN32) - find_path(PangoCairo_INCLUDE_DIR pango/pangocairo.h PATH_SUFFIXES pango-1.0) + find_path(PANGOCAIRO_INCLUDE_DIR pango/pangocairo.h PATH_SUFFIXES pango-1.0) find_path(GLIB_INCLUDE_DIR glib.h PATH_SUFFIXES glib-2.0) find_path(GLIBCONFIG_INCLUDE_DIR glibconfig.h PATH_SUFFIXES glib-2.0/include lib/glib-2.0/include) find_path(HARFBUZZ_INCLUDE_DIR hb.h PATH_SUFFIXES harfbuzz) @@ -9,83 +9,83 @@ if(WIN32) find_library(GLIB_LIBRARY NAMES glib-2.0) find_library(GOBJECT_LIBRARY NAMES gobject-2.0) find_library(PANGO_LIBRARY NAMES pango-1.0) - find_library(PangoCairo_LIBRARY NAMES pangocairo-1.0) + find_library(PANGOCAIRO_LIBRARY NAMES pangocairo-1.0) find_library(HARFBUZZ_LIBRARY NAMES harfbuzz) find_program(GLIB_RUNTIME_LIBRARY NAMES glib-2.dll libglib-2.0-0.dll) find_program(GOBJECT_RUNTIME_LIBRARY NAMES gobject-2.dll libgobject-2.0-0.dll) find_program(HARFBUZZ_RUNTIME_LIBRARY NAMES libharfbuzz-0.dll) find_program(PANGO_RUNTIME_LIBRARY NAMES pango-1.dll libpango-1.0-0.dll) - find_program(PangoCairo_RUNTIME_LIBRARY NAMES pangocairo-1.dll libpangocairo-1.0-0.dll) + find_program(PANGOCAIRO_RUNTIME_LIBRARY NAMES pangocairo-1.dll libpangocairo-1.0-0.dll) find_program(PANGOFT_RUNTIME_LIBRARY NAMES pangoft2-1.dll libpangoft2-1.0-0.dll) find_program(PANGOWIN_RUNTIME_LIBRARY NAMES pangowin32-1.dll libpangowin32-1.0-0.dll) - find_package_handle_standard_args(PangoCairo DEFAULT_MSG + find_package_handle_standard_args(PANGOCAIRO DEFAULT_MSG GLIB_INCLUDE_DIR GLIBCONFIG_INCLUDE_DIR - PangoCairo_INCLUDE_DIR + PANGOCAIRO_INCLUDE_DIR HARFBUZZ_INCLUDE_DIR GLIB_LIBRARY GOBJECT_LIBRARY PANGO_LIBRARY - PangoCairo_LIBRARY + PANGOCAIRO_LIBRARY HARFBUZZ_LIBRARY GLIB_RUNTIME_LIBRARY GOBJECT_RUNTIME_LIBRARY HARFBUZZ_RUNTIME_LIBRARY PANGO_RUNTIME_LIBRARY - PangoCairo_RUNTIME_LIBRARY + PANGOCAIRO_RUNTIME_LIBRARY PANGOFT_RUNTIME_LIBRARY PANGOWIN_RUNTIME_LIBRARY ) - set(PangoCairo_INCLUDE_DIRS + set(PANGOCAIRO_INCLUDE_DIRS ${GLIB_INCLUDE_DIR} ${GLIBCONFIG_INCLUDE_DIR} - ${PangoCairo_INCLUDE_DIR} + ${PANGOCAIRO_INCLUDE_DIR} ${HARFBUZZ_INCLUDE_DIR} ) - set(PangoCairo_LIBRARIES + set(PANGOCAIRO_LIBRARIES glib-2.0 gobject-2.0 pango-1.0 pangocairo-1.0 ) - set(PangoCairo_LINK_LIBRARIES + set(PANGOCAIRO_LINK_LIBRARIES ${GLIB_LIBRARY} ${GOBJECT_LIBRARY} ${PANGO_LIBRARY} - ${PangoCairo_LIBRARY} + ${PANGOCAIRO_LIBRARY} ${HARFBUZZ_LIBRARY} ) - set(PangoCairo_RUNTIME_LIBRARIES + set(PANGOCAIRO_RUNTIME_LIBRARIES ${GLIB_RUNTIME_LIBRARY} ${GOBJECT_RUNTIME_LIBRARY} ${HARFBUZZ_RUNTIME_LIBRARY} ${PANGO_RUNTIME_LIBRARY} - ${PangoCairo_RUNTIME_LIBRARY} + ${PANGOCAIRO_RUNTIME_LIBRARY} ${PANGOFT_RUNTIME_LIBRARY} ${PANGOWIN_RUNTIME_LIBRARY} ) else() find_package(PkgConfig) - pkg_check_modules(PangoCairo pangocairo) + pkg_check_modules(PANGOCAIRO pangocairo) # prior to CMake 3.12, PkgConfig does not set *_LINK_LIBRARIES, so do it # manually if(${CMAKE_VERSION} VERSION_LESS 3.12) - find_library(PangoCairo_LINK_LIBRARIES pangocairo-1.0 + find_library(PANGOCAIRO_LINK_LIBRARIES pangocairo-1.0 PATHS ENV LIBRARY_PATH) endif() - find_package_handle_standard_args(PangoCairo DEFAULT_MSG - PangoCairo_INCLUDE_DIRS - PangoCairo_LIBRARIES - PangoCairo_LINK_LIBRARIES + find_package_handle_standard_args(PANGOCAIRO DEFAULT_MSG + PANGOCAIRO_INCLUDE_DIRS + PANGOCAIRO_LIBRARIES + PANGOCAIRO_LINK_LIBRARIES ) endif() diff --git a/plugin/pango/CMakeLists.txt b/plugin/pango/CMakeLists.txt index 82012809e..6ca95a710 100644 --- a/plugin/pango/CMakeLists.txt +++ b/plugin/pango/CMakeLists.txt @@ -1,4 +1,4 @@ -if(CAIRO_FOUND AND PangoCairo_FOUND) +if(CAIRO_FOUND AND PANGOCAIRO_FOUND) add_library(gvplugin_pango SHARED # Header files @@ -23,14 +23,14 @@ target_include_directories(gvplugin_pango PRIVATE ${GRAPHVIZ_LIB_DIR}/gvc ${GRAPHVIZ_LIB_DIR}/pathplan ${CAIRO_INCLUDE_DIRS}/cairo - ${PangoCairo_INCLUDE_DIRS} + ${PANGOCAIRO_INCLUDE_DIRS} ) target_link_libraries(gvplugin_pango cgraph gvc ${CAIRO_LINK_LIBRARIES} - ${PangoCairo_LINK_LIBRARIES} + ${PANGOCAIRO_LINK_LIBRARIES} ) # Installation location of library files @@ -46,7 +46,7 @@ if(WIN32 AND install_win_dependency_dlls) install( FILES ${CAIRO_RUNTIME_LIBRARIES} - ${PangoCairo_RUNTIME_LIBRARIES} + ${PANGOCAIRO_RUNTIME_LIBRARIES} DESTINATION ${BINARY_INSTALL_DIR} ) endif() -- 2.40.0