From 659d079d5ca44caf210f61ac49534589b75d3f3d Mon Sep 17 00:00:00 2001
From: comex <comexk@gmail.com>
Date: Sat, 25 Jun 2016 23:30:32 -0400
Subject: [PATCH] Fix in-tree build (cmake .) on OS X.

OS X uses a case insensitive filesystem by default: when I try to build,
a system header does #include <assert.h>, which picks up
Source/Core/Common/Assert.h.  This only happens because CMakeLists adds
'${PROJECT_BINARY_DIR}/Source/Core/Common' as an include directory: in
an out-of-tree build, that directory contains no other source files, but
in an in-tree build PROJECT_BINARY_DIR is just the source root.

This is only used for scmrev.h.  Change the include directory to
'${PROJECT_BINARY_DIR}/Source/Core' and the include to
"Common/scmrev.h", which is more consistent with normal headers anyway.
---
 CMakeLists.txt                 | 2 +-
 Source/Core/Common/Version.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5df4b2eb1f..45b479a585 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -942,7 +942,7 @@ file(WRITE ${PROJECT_BINARY_DIR}/Source/Core/Common/scmrev.h
 	"#define SCM_IS_MASTER " ${DOLPHIN_WC_IS_STABLE} "\n"
 	"#define SCM_DISTRIBUTOR_STR \"" ${DISTRIBUTOR} "\"\n"
 	)
-include_directories("${PROJECT_BINARY_DIR}/Source/Core/Common")
+include_directories("${PROJECT_BINARY_DIR}/Source/Core")
 
 ########################################
 # Unit testing.
diff --git a/Source/Core/Common/Version.cpp b/Source/Core/Common/Version.cpp
index c21896afdc..fba14eeeb6 100644
--- a/Source/Core/Common/Version.cpp
+++ b/Source/Core/Common/Version.cpp
@@ -3,7 +3,7 @@
 // Refer to the license.txt file included.
 
 #include "Common/Common.h"
-#include "scmrev.h"
+#include "Common/scmrev.h"
 
 #ifdef _DEBUG
 #define BUILD_TYPE_STR "Debug "