Skip to content

Commit

Permalink
CMake: fix native IOS build
Browse files Browse the repository at this point in the history
OGRE-548 #close applied suggested changes
  • Loading branch information
paroj committed May 31, 2017
1 parent 574b62a commit a43973a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
4 changes: 2 additions & 2 deletions CMake/toolchain/ios.toolchain.xcode.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ endif ()
set(CMAKE_AR ar CACHE FILEPATH "" FORCE)

# Skip the platform compiler checks for cross compiling
#set (CMAKE_CXX_COMPILER_WORKS TRUE)
#set (CMAKE_C_COMPILER_WORKS TRUE)
set (CMAKE_CXX_COMPILER_WORKS TRUE)
set (CMAKE_C_COMPILER_WORKS TRUE)

# All iOS/Darwin specific settings - some may be redundant
set (CMAKE_SHARED_LIBRARY_PREFIX "lib")
Expand Down
3 changes: 2 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -201,9 +201,10 @@ if ((CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGXX) AND NOT MINGW)
endif ((CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGXX) AND NOT MINGW)

# determine system endianess
if (MSVC OR ANDROID OR EMSCRIPTEN)
if (MSVC OR ANDROID OR EMSCRIPTEN OR APPLE_IOS)
# This doesn't work on VS 2010
# MSVC only builds for intel anyway
# all IOS devices are little endian
set(OGRE_TEST_BIG_ENDIAN FALSE)
else()
include(TestBigEndian)
Expand Down

0 comments on commit a43973a

Please sign in to comment.