From 6ef6f0f5c08c5a880687b85427d29670c3f24282 Mon Sep 17 00:00:00 2001
From: Clownacy <Clownacy@users.noreply.github.com>
Date: Sun, 5 May 2019 14:19:40 +0100
Subject: [PATCH] Tweak how FORCE_LOCAL_LIBS works

---
 CMakeLists.txt          | 16 +++++++++++-----
 DoConfig/CMakeLists.txt |  7 +++++--
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7c3e27aa..674612a7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -321,12 +321,15 @@ endif()
 
 # Find dependencies
 
-find_package(SDL2)
-if(TARGET SDL2::SDL2 AND NOT FORCE_LOCAL_LIBS)
+if(NOT FORCE_LOCAL_LIBS)
+	find_package(SDL2)
+endif()
+
+if(TARGET SDL2::SDL2)
 	# CMake-generated config (Arch, vcpkg, Raspbian)
 	message(STATUS "Using system SDL2")
 	target_link_libraries(CSE2 SDL2::SDL2 SDL2::SDL2main)
-elseif(SDL2_FOUND AND NOT FORCE_LOCAL_LIBS)
+elseif(SDL2_FOUND)
 	# Autotools-generated config (MSYS2)
 	message(STATUS "Using system SDL2")
 	target_include_directories(CSE2 PRIVATE ${SDL2_INCLUDE_DIRS})
@@ -339,8 +342,11 @@ else()
 	target_link_libraries(CSE2 SDL2-static SDL2main)
 endif()
 
-find_package(Freetype)
-if(FREETYPE_FOUND AND NOT FORCE_LOCAL_LIBS)
+if(NOT FORCE_LOCAL_LIBS)
+	find_package(Freetype)
+endif()
+
+if(FREETYPE_FOUND)
 	message(STATUS "Using system FreeType")
 	target_include_directories(CSE2 PRIVATE ${FREETYPE_INCLUDE_DIRS})
 	target_link_libraries(CSE2 ${FREETYPE_LIBRARIES})
diff --git a/DoConfig/CMakeLists.txt b/DoConfig/CMakeLists.txt
index 90c0e0ac..6c1d9776 100644
--- a/DoConfig/CMakeLists.txt
+++ b/DoConfig/CMakeLists.txt
@@ -24,8 +24,11 @@ if(MSVC)
 endif()
 
 # Find FLTK
-find_package(FLTK)
-if(FLTK_FOUND AND NOT FORCE_LOCAL_LIBS)
+if(NOT FORCE_LOCAL_LIBS)
+	find_package(FLTK)
+endif()
+
+if(FLTK_FOUND)
 	message(STATUS "Using system FLTK")
 	target_include_directories(DoConfig PRIVATE ${FLTK_INCLUDE_DIR})
 	target_link_libraries(DoConfig ${FLTK_LIBRARIES})