midou/citra-shitamoto-network
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #483 from yuriks/cmake-fix

Browse Source 
CMake: Inform the user when architecture auto-detection fails
This commit is contained in:
bunnei 2015-02-03 12:42:46 -05:00
commit a9b3f29b90
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@ -16,7 +16,7 @@ else()
# Tweak optimization settings # Tweak optimization settings
# As far as I can tell, there's no way to override the CMake defaults while leaving user # As far as I can tell, there's no way to override the CMake defaults while leaving user
# changes intact, so we'll just clobber everything and say sorry. # changes intact, so we'll just clobber everything and say sorry.
message(STATUS "Cache compiler flags ignored, please edit CMakeFiles.txt to change the flags.") message(STATUS "Cache compiler flags ignored, please edit CMakeLists.txt to change the flags.")
# /MP - Multi-threaded compilation # /MP - Multi-threaded compilation
# /MD - Multi-threaded runtime # /MD - Multi-threaded runtime
# /Ox - Full optimization # /Ox - Full optimization
@ -66,8 +66,11 @@ if (ENABLE_GLFW)
if (MSVC) if (MSVC)
if (CMAKE_SIZEOF_VOID_P EQUAL 8) if (CMAKE_SIZEOF_VOID_P EQUAL 8)
set(TMP_ARCH "x64") set(TMP_ARCH "x64")
else() elseif (CMAKE_SIZEOF_VOID_P EQUAL 4)
set(TMP_ARCH "Win32") set(TMP_ARCH "Win32")
else()
set(TMP_ARCH "UNKNOWN")
message(SEND_ERROR "Couldn't detect your compiler's architecture, you'll have to manually specify the GLFW library to use. (Try checking CMakeOutput.log to find out why.)")
endif() endif()
if (MSVC11) # Visual C++ 2012 if (MSVC11) # Visual C++ 2012
@ -84,8 +87,11 @@ if (ENABLE_GLFW)
# Assume mingw # Assume mingw
if (CMAKE_SIZEOF_VOID_P EQUAL 8) if (CMAKE_SIZEOF_VOID_P EQUAL 8)
set(TMP_ARCH "x86_64") set(TMP_ARCH "x86_64")
else() elseif (CMAKE_SIZEOF_VOID_P EQUAL 4)
set(TMP_ARCH "i686") set(TMP_ARCH "i686")
else()
set(TMP_ARCH "UNKNOWN")
message(SEND_ERROR "Couldn't detect your compiler's architecture, you'll have to manually specify the GLFW library to use.")
endif() endif()
set(TMP_TOOLSET "mingw-${TMP_ARCH}") set(TMP_TOOLSET "mingw-${TMP_ARCH}")