From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Fri, 28 Aug 2020 03:09:28 +0000 (-0700)
Subject: fix case warnings for RxSpencer during CMake builds
X-Git-Tag: 2.46.0~20^2^2~98^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=77c3023e1fe41aed4436e9b713a85c804e979676;p=graphviz

fix case warnings for RxSpencer during CMake builds

This fixes the following CI warning:

  -- Found RXSPENCER: ...rxspencer.lib
  CMake Warning (dev) at ...FindPackageHandleStandardArgs.cmake:272 (message):
    The package name passed to `find_package_handle_standard_args` (RXSPENCER)
    does not match the name of the calling package (RxSpencer).  This can lead
    to problems in calling code that expects `find_package` result variables
    (e.g., `_FOUND`) to follow a certain pattern.
  Call Stack (most recent call first):
    cmake/FindRxSpencer.cmake:5 (find_package_handle_standard_args)
    CMakeLists.txt:90 (find_package)
  This warning is for project developers.  Use -Wno-dev to suppress it.
---

diff --git a/cmake/FindRxSpencer.cmake b/cmake/FindRxSpencer.cmake
index d53419173..3c915a71b 100644
--- a/cmake/FindRxSpencer.cmake
+++ b/cmake/FindRxSpencer.cmake
@@ -1,16 +1,16 @@
-find_path(RXSPENCER_INCLUDE_DIR regex.h)
-find_library(RXSPENCER_LIBRARY NAMES rxspencer)
+find_path(RxSpencer_INCLUDE_DIR regex.h)
+find_library(RxSpencer_LIBRARY NAMES rxspencer)
 
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(RXSPENCER DEFAULT_MSG
-    RXSPENCER_LIBRARY
-    RXSPENCER_INCLUDE_DIR
+find_package_handle_standard_args(RxSpencer DEFAULT_MSG
+    RxSpencer_LIBRARY
+    RxSpencer_INCLUDE_DIR
 )
 
 mark_as_advanced(
-    RXSPENCER_INCLUDE_DIR
-    RXSPENCER_LIBRARY
+    RxSpencer_INCLUDE_DIR
+    RxSpencer_LIBRARY
 )
 
-set(RXSPENCER_INCLUDE_DIRS ${RXSPENCER_INCLUDE_DIR})
-set(RXSPENCER_LIBRARIES ${RXSPENCER_LIBRARY})
+set(RxSpencer_INCLUDE_DIRS ${RxSpencer_INCLUDE_DIR})
+set(RxSpencer_LIBRARIES ${RxSpencer_LIBRARY})
diff --git a/lib/gvc/CMakeLists.txt b/lib/gvc/CMakeLists.txt
index 5622eefe6..7f71db9ab 100644
--- a/lib/gvc/CMakeLists.txt
+++ b/lib/gvc/CMakeLists.txt
@@ -9,7 +9,7 @@ include_directories(
     ${GRAPHVIZ_LIB_DIR}/common
     ${GRAPHVIZ_LIB_DIR}/pathplan
     ${LTDL_INCLUDE_DIRS}
-    ${RXSPENCER_INCLUDE_DIRS}
+    ${RxSpencer_INCLUDE_DIRS}
 )
 
 add_library(gvc SHARED
@@ -57,7 +57,7 @@ target_link_libraries(gvc
     pathplan
     xdot
     ${EXPAT_LIBRARIES}
-    ${RXSPENCER_LIBRARIES}
+    ${RxSpencer_LIBRARIES}
     ${ZLIB_LIBRARIES}
     ${MATH_LIB}
 )