Update CMake files and SDL2 lib finders

Author: Twinklebear

CMakeLists.txt

@@ -8,8 +8,8 @@ set(BIN_DIR ${TwinklebearDevLessons_SOURCE_DIR}/bin)
 # Bump up warning levels appropriately for clang, gcc & msvc and build in debug mode
 if (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU" OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic -std=c++11")
-	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS} -g")
-	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} -O2")
+	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG} -g")
+	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE} -O2")
 elseif (${CMAKE_CXX_COMPILER_ID} STREQUAL "MSVC")
 	if (CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
 		string(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")

cmake/FindSDL2.cmake

@@ -105,6 +105,7 @@
 
 FIND_PATH(SDL2_INCLUDE_DIR SDL.h
 	HINTS
+	${SDL2}
 	$ENV{SDL2}
 	PATH_SUFFIXES include/SDL2 include SDL2
 	i686-w64-mingw32/include/SDL2
@@ -124,6 +125,7 @@ FIND_PATH(SDL2_INCLUDE_DIR SDL.h
 IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
 	FIND_LIBRARY(SDL2_LIBRARY_TEMP SDL2
 		HINTS
+		${SDL2}
 		$ENV{SDL2}
 		PATH_SUFFIXES lib64 lib
 		lib/x64
@@ -138,6 +140,7 @@ IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
 ELSE(CMAKE_SIZEOF_VOID_P EQUAL 8)
 	FIND_LIBRARY(SDL2_LIBRARY_TEMP SDL2
 		HINTS
+		${SDL2}
 		$ENV{SDL2}
 		PATH_SUFFIXES lib
 		lib/x86
@@ -161,6 +164,7 @@ IF(NOT SDL2_BUILDING_LIBRARY)
 			FIND_LIBRARY(SDL2MAIN_LIBRARY
 				NAMES SDL2main
 				HINTS
+				${SDL2}
 				$ENV{SDL2}
 				PATH_SUFFIXES lib64 lib
 				lib/x64
@@ -176,6 +180,7 @@ IF(NOT SDL2_BUILDING_LIBRARY)
 			FIND_LIBRARY(SDL2MAIN_LIBRARY
 				NAMES SDL2main
 				HINTS
+				${SDL2}
 				$ENV{SDL2}
 				PATH_SUFFIXES lib
 				lib/x86

cmake/FindSDL2_image.cmake

@@ -90,6 +90,7 @@
 
 FIND_PATH(SDL2_IMAGE_INCLUDE_DIR SDL_image.h
 	HINTS
+	${SDL2}
 	$ENV{SDL2}
 	$ENV{SDL2_IMAGE}
 	PATH_SUFFIXES include/SDL2 include SDL2
@@ -111,6 +112,7 @@ IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
 	FIND_LIBRARY(SDL2_IMAGE_LIBRARY_TEMP
 		NAMES SDL2_image
 		HINTS
+		${SDL2}
 		$ENV{SDL2}
 		$ENV{SDL2_IMAGE}
 		PATH_SUFFIXES lib64 lib
@@ -127,6 +129,7 @@ ELSE(CMAKE_SIZEOF_VOID_P EQUAL 8)
 	FIND_LIBRARY(SDL2_IMAGE_LIBRARY_TEMP
 		NAMES SDL2_image
 		HINTS
+		${SDL2}
 		$ENV{SDL2}
 		$ENV{SDL2_IMAGE}
 		PATH_SUFFIXES lib

cmake/FindSDL2_ttf.cmake

@@ -90,6 +90,7 @@
 
 FIND_PATH(SDL2_TTF_INCLUDE_DIR SDL_ttf.h
 	HINTS
+	${SDL2}
 	$ENV{SDL2}
 	$ENV{SDL2_TTF}
 	PATH_SUFFIXES include/SDL2 include SDL2
@@ -110,6 +111,7 @@ IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
 	FIND_LIBRARY(SDL2_TTF_LIBRARY_TEMP
 		NAMES SDL2_ttf
 		HINTS
+		${SDL2}
 		$ENV{SDL2}
 		$ENV{SDL2_TTF}
 		PATH_SUFFIXES lib64 lib
@@ -126,6 +128,7 @@ ELSE(CMAKE_SIZEOF_VOID_P EQUAL 8)
 	FIND_LIBRARY(SDL2_TTF_LIBRARY_TEMP
 		NAMES SDL2_ttf
 		HINTS
+		${SDL2}
 		$ENV{SDL2}
 		$ENV{SDL2_TTF}
 		PATH_SUFFIXES lib