ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
comex 2016-06-25 23:30:32 -04:00
parent e31a4d1f07
commit 659d079d5c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -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_IS_MASTER " ${DOLPHIN_WC_IS_STABLE} "\n"
"#define SCM_DISTRIBUTOR_STR \"" ${DISTRIBUTOR} "\"\n" "#define SCM_DISTRIBUTOR_STR \"" ${DISTRIBUTOR} "\"\n"
) )
include_directories("${PROJECT_BINARY_DIR}/Source/Core/Common") include_directories("${PROJECT_BINARY_DIR}/Source/Core")
######################################## ########################################
# Unit testing. # Unit testing.

2
Source/Core/Common/Version.cpp
View File

@ -3,7 +3,7 @@
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "Common/Common.h" #include "Common/Common.h"
#include "scmrev.h" #include "Common/scmrev.h"
#ifdef _DEBUG #ifdef _DEBUG
#define BUILD_TYPE_STR "Debug " #define BUILD_TYPE_STR "Debug "