From 700bfd78b816f8a8b63e85fee39796bab81ecdba Mon Sep 17 00:00:00 2001
From: def <dennis@felsin9.de>
Date: Sat, 3 Oct 2020 13:39:23 +0200
Subject: [PATCH] Try to fix FindSQLite3.cmake

For AlwaysLivid's Haiku port:

> CMake Error: The following variables are used in this project, but they are set to NOTFOUND.
> Please set them or make sure they are set and tested correctly in the CMake files:
> /boot/home/ddnet/SQLite3_INCLUDEDIR

@heinrich5991 thoughts?
---
 cmake/FindSQLite3.cmake | 46 ++++++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 24 deletions(-)

diff --git a/cmake/FindSQLite3.cmake b/cmake/FindSQLite3.cmake
index 77d28cf70..2c71243e5 100644
--- a/cmake/FindSQLite3.cmake
+++ b/cmake/FindSQLite3.cmake
@@ -4,32 +4,30 @@ if(NOT PREFER_BUNDLED_LIBS)
   set(CMAKE_MODULE_PATH ${OWN_CMAKE_MODULE_PATH})
 endif()
 
-if(NOT SQLite3_FOUND)
-  if(NOT CMAKE_CROSSCOMPILING)
-    find_package(PkgConfig QUIET)
-    pkg_check_modules(PC_SQLite3 sqlite3)
-  endif()
-
-  set_extra_dirs_lib(SQLite3 sqlite3)
-  find_library(SQLite3_LIBRARY
-    NAMES sqlite3 sqlite3.0
-    HINTS ${HINTS_SQLite3_LIBDIR} ${PC_SQLite3_LIBDIR} ${PC_SQLite3_LIBRARY_DIRS}
-    PATHS ${PATHS_SQLite3_LIBDIR}
-    ${CROSSCOMPILING_NO_CMAKE_SYSTEM_PATH}
-  )
-  set_extra_dirs_include(SQLite3 sqlite3 "${SQLite3_LIBRARY}")
-  find_path(SQLite3_INCLUDEDIR sqlite3.h
-    PATH_SUFFIXES sqlite3
-    HINTS ${HINTS_SQLite3_INCLUDEDIR} ${PC_SQLite3_INCLUDEDIR} ${PC_SQLite3_INCLUDE_DIRS}
-    PATHS ${PATHS_SQLite3_INCLUDEDIR}
-    ${CROSSCOMPILING_NO_CMAKE_SYSTEM_PATH}
-  )
-
-  include(FindPackageHandleStandardArgs)
-  find_package_handle_standard_args(SQLite3 DEFAULT_MSG SQLite3_INCLUDEDIR SQLite3_LIBRARY)
-  mark_as_advanced(SQLite3_INCLUDEDIR SQLite3_LIBRARY)
+if(NOT CMAKE_CROSSCOMPILING)
+  find_package(PkgConfig QUIET)
+  pkg_check_modules(PC_SQLite3 sqlite3)
 endif()
 
+set_extra_dirs_lib(SQLite3 sqlite3)
+find_library(SQLite3_LIBRARY
+  NAMES sqlite3 sqlite3.0
+  HINTS ${HINTS_SQLite3_LIBDIR} ${PC_SQLite3_LIBDIR} ${PC_SQLite3_LIBRARY_DIRS}
+  PATHS ${PATHS_SQLite3_LIBDIR}
+  ${CROSSCOMPILING_NO_CMAKE_SYSTEM_PATH}
+)
+set_extra_dirs_include(SQLite3 sqlite3 "${SQLite3_LIBRARY}")
+find_path(SQLite3_INCLUDEDIR sqlite3.h
+  PATH_SUFFIXES sqlite3
+  HINTS ${HINTS_SQLite3_INCLUDEDIR} ${PC_SQLite3_INCLUDEDIR} ${PC_SQLite3_INCLUDE_DIRS}
+  PATHS ${PATHS_SQLite3_INCLUDEDIR}
+  ${CROSSCOMPILING_NO_CMAKE_SYSTEM_PATH}
+)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(SQLite3 DEFAULT_MSG SQLite3_INCLUDEDIR SQLite3_LIBRARY)
+mark_as_advanced(SQLite3_INCLUDEDIR SQLite3_LIBRARY)
+
 if(SQLite3_FOUND)
   is_bundled(SQLite3_BUNDLED "${SQLite3_LIBRARY}")
   set(SQLite3_LIBRARIES ${SQLite3_LIBRARY})