From a165624e502f532d0451a6a5c7695ab47b7647c2 Mon Sep 17 00:00:00 2001
From: Daniel Scharrer <daniel@constexpr.org>
Date: Tue, 9 Dec 2014 11:10:16 +0100
Subject: [PATCH] CMake: Fix potential future cmake compat issue

Fixes CMP0054 warning with CMake 3.

See: bug #694
---
 cmake/BuildSystem.cmake | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/cmake/BuildSystem.cmake b/cmake/BuildSystem.cmake
index c355fca237..0474d5f8b8 100644
--- a/cmake/BuildSystem.cmake
+++ b/cmake/BuildSystem.cmake
@@ -45,7 +45,7 @@ function(enable_unity_build UB_SUFFIX SOURCE_VARIABLE_NAME)
 	set(currentIdx 1)
 	foreach(source_file IN LISTS files)
 		
-		if("${source_file}" MATCHES ".rc$")
+		if(source_file MATCHES ".rc$")
 			
 			# .rc files need to be compiled separately
 			
@@ -120,7 +120,8 @@ endfunction()
 #  BIN  Name of the binary to change the type of.
 #  DIR  Where to install the binary.
 function(set_binary_installdir BIN DIR)
-	if("${SHARED_BUILD_${BIN}_TYPE}" STREQUAL "SHARED")
+	set(build_type "${SHARED_BUILD_${BIN}_TYPE}")
+	if(build_type STREQUAL "SHARED")
 		set(install LIBRARY DESTINATION "${DIR}" ARCHIVE DESTINATION "${DIR}")
 	else()
 		set(install RUNTIME DESTINATION "${DIR}")
@@ -255,7 +256,8 @@ function(_shared_build_helper LIB LIST BINARIES FIRST)
 		# Remove sources from binaries and link the library instead.
 		foreach(bin IN LISTS BINARIES)
 			
-			if("${SHARED_BUILD_${bin}_TYPE}" STREQUAL "SHARED")
+			set(build_type "${SHARED_BUILD_${bin}_TYPE}")
+			if(build_type STREQUAL "SHARED")
 				set(is_shared_lib 1)
 			endif()
 			
@@ -307,7 +309,8 @@ function(_shared_build_add_binary bin)
 		endforeach()
 	endif()
 	
-	if("${SHARED_BUILD_${bin}_TYPE}" STREQUAL "SHARED")
+	set(build_type "${SHARED_BUILD_${bin}_TYPE}")
+	if(build_type STREQUAL "SHARED")
 		add_library(
 			${bin} ${SHARED_BUILD_${bin}_TYPE}
 			${SHARED_BUILD_${bin}_SOURCES}