Use CMake-provided 'StbImage_FOUND', not incorrect manual 'STB_IMAGE_…

…FOUND' (#3660)
mlpack · Mar 25, 2024 · 4f92ca7 · 4f92ca7
1 parent 24e6c93
commit 4f92ca7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/CMake/FindStbImage.cmake b/CMake/FindStbImage.cmake
@@ -16,7 +16,6 @@ find_path(STB_IMAGE_INCLUDE_DIR_1
     PATHS ${STB_IMAGE_SEARCH_PATHS} ${STB_IMAGE_INCLUDE_DIR})
 
 if(STB_IMAGE_INCLUDE_DIR_1)
-  set(STB_IMAGE_FOUND YES)
   set(STB_IMAGE_INCLUDE_DIR "${STB_IMAGE_INCLUDE_DIR_1}" CACHE PATH
       "stb_image include directory")
 
@@ -32,7 +31,6 @@ else ()
         PATH_SUFFIXES stb/)
 
   if(STB_IMAGE_INCLUDE_DIR_2)
-    set(STB_IMAGE_FOUND YES)
     set(STB_IMAGE_INCLUDE_DIR "${STB_IMAGE_INCLUDE_DIR_2}" CACHE PATH
         "stb_image include directory")
 
@@ -47,7 +45,6 @@ endif ()
 
 # Checks 'REQUIRED'.
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(StbImage
-    REQUIRED_VARS STB_IMAGE_INCLUDE_DIR)
+find_package_handle_standard_args(StbImage REQUIRED_VARS STB_IMAGE_INCLUDE_DIR)
 
 mark_as_advanced(STB_IMAGE_INCLUDE_DIR)
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -312,14 +312,14 @@ if (NOT DOWNLOAD_DEPENDENCIES)
   find_package(StbImage)
 else()
   find_package(StbImage)
-  if (NOT STB_IMAGE_FOUND)
+  if (NOT StbImage_FOUND)
     get_deps(https://mlpack.org/files/stb.tar.gz stb stb.tar.gz)
     set(STB_IMAGE_INCLUDE_DIR ${GENERIC_INCLUDE_DIR})
     find_package(StbImage REQUIRED)
   endif()
 endif()
 
-if (STB_IMAGE_FOUND)
+if (StbImage_FOUND)
   set(STB_AVAILABLE "1")
   set(MLPACK_INCLUDE_DIRS ${MLPACK_INCLUDE_DIRS} "${STB_IMAGE_INCLUDE_DIR}")