Merge pull request #6498 from MapServer/backport-6497-to-branch-7-6

jmckenna · web-flow · commit e0b8f4e65ea9 · 2022-03-23T09:02:43.000-03:00
[Backport branch-7-6] Fix CMake package name warnings
diff --git a/cmake/FindCairo.cmake b/cmake/FindCairo.cmake
@@ -73,5 +73,5 @@ ENDIF ()
 set(CAIRO_INCLUDE_DIRS ${CAIRO_INCLUDE_DIR} ${FC_INCLUDE_DIR})
 set(CAIRO_LIBRARIES ${CAIRO_LIBRARY})
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(CAIRO DEFAULT_MSG CAIRO_LIBRARY CAIRO_INCLUDE_DIR)
+find_package_handle_standard_args(Cairo DEFAULT_MSG CAIRO_LIBRARY CAIRO_INCLUDE_DIR)
 mark_as_advanced(CAIRO_LIBRARY CAIRO_INCLUDE_DIR)
diff --git a/cmake/FindFriBiDi.cmake b/cmake/FindFriBiDi.cmake
@@ -26,5 +26,5 @@ find_library(FRIBIDI_LIBRARY
 set(FRIBIDI_INCLUDE_DIRS ${FRIBIDI_INCLUDE_DIR})
 set(FRIBIDI_LIBRARIES ${FRIBIDI_LIBRARY})
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(FRIBIDI DEFAULT_MSG FRIBIDI_LIBRARY FRIBIDI_INCLUDE_DIR)
+find_package_handle_standard_args(FriBiDi DEFAULT_MSG FRIBIDI_LIBRARY FRIBIDI_INCLUDE_DIR)
 mark_as_advanced(FRIBIDI_LIBRARY FRIBIDI_INCLUDE_DIR)
diff --git a/cmake/FindHarfBuzz.cmake b/cmake/FindHarfBuzz.cmake
@@ -31,7 +31,7 @@
 # HARFBUZZ_INCLUDE_DIR - containg the HarfBuzz headers
 # HARFBUZZ_LIBRARY - containg the HarfBuzz library
 
-include(FindPkgConfig)
+find_package(PkgConfig)
 
 pkg_check_modules(PC_HARFBUZZ harfbuzz>=0.9.18)
 
diff --git a/cmake/FindProj.cmake b/cmake/FindProj.cmake
@@ -11,7 +11,7 @@ FIND_PATH(PROJ_INCLUDE_DIR NAMES proj.h proj_api.h)
 FIND_LIBRARY(PROJ_LIBRARY NAMES proj proj_i)
 
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(PROJ DEFAULT_MSG PROJ_LIBRARY PROJ_INCLUDE_DIR)
+find_package_handle_standard_args(Proj DEFAULT_MSG PROJ_LIBRARY PROJ_INCLUDE_DIR)
 mark_as_advanced(PROJ_LIBRARY PROJ_INCLUDE_DIR)
 
 
diff --git a/cmake/FindSVGCairo.cmake b/cmake/FindSVGCairo.cmake
@@ -48,5 +48,5 @@ find_package_handle_standard_args(SVG DEFAULT_MSG SVG_LIBRARY SVG_INCLUDE_DIR)
 mark_as_advanced(SVG_LIBRARY SVG_INCLUDE_DIR)
 set(SVGCAIRO_INCLUDE_DIRS ${SVGCAIRO_INCLUDE_DIR})
 set(SVGCAIRO_LIBRARIES ${SVGCAIRO_LIBRARY})
-find_package_handle_standard_args(SVGCAIRO DEFAULT_MSG SVGCAIRO_LIBRARY SVGCAIRO_INCLUDE_DIR)
+find_package_handle_standard_args(SVGCairo DEFAULT_MSG SVGCAIRO_LIBRARY SVGCAIRO_INCLUDE_DIR)
 mark_as_advanced(SVGCAIRO_LIBRARY SVGCAIRO_INCLUDE_DIR)
