diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-04-27 14:41:57 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-04-27 14:42:08 +0300 |
| commit | 98b6c6f2c0227b9a6d9db8bd47ee6cad27f35b4b (patch) | |
| tree | 0e13eee0ea3845dcafa0440323635f3ae38a7a5e /CMakeLists.txt | |
| parent | 21d31f8f58ff1454b663faac0d1260f7c5168a65 (diff) | |
| parent | bdf8ad6c4e521884a544f6dbfa244c27720cd4bb (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 0b701cabedd..3f2b3dad520 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -192,7 +192,7 @@ endif() #----------------------------------------------------------------------------- # Options -# First platform spesific non-cached vars +# First platform specific non-cached vars if(UNIX AND NOT APPLE) set(WITH_X11 ON) endif() @@ -916,16 +916,16 @@ endif() if(MSVC) # for some reason this fails on msvc add_definitions(-D__LITTLE_ENDIAN__) - -# OSX-Note: as we do crosscompiling with specific set architecture, -# endianess-detection and autosetting is counterproductive + +# OSX-Note: as we do cross-compiling with specific set architecture, +# endianess-detection and auto-setting is counterproductive # so we just set endianess according CMAKE_OSX_ARCHITECTURES elseif(CMAKE_OSX_ARCHITECTURES MATCHES i386 OR CMAKE_OSX_ARCHITECTURES MATCHES x86_64) add_definitions(-D__LITTLE_ENDIAN__) -elseif(CMAKE_OSX_ARCHITECTURES MATCHES ppc OR CMAKE_OSX_ARCHITECTURES MATCHES ppc64) +elseif(CMAKE_OSX_ARCHITECTURES MATCHES ppc OR CMAKE_OSX_ARCHITECTURES MATCHES ppc64) add_definitions(-D__BIG_ENDIAN__) - + else() include(TestBigEndian) test_big_endian(_SYSTEM_BIG_ENDIAN) @@ -1526,7 +1526,7 @@ endif() set(CMAKE_C_FLAGS "${C_WARNINGS} ${CMAKE_C_FLAGS} ${PLATFORM_CFLAGS}") set(CMAKE_CXX_FLAGS "${CXX_WARNINGS} ${CMAKE_CXX_FLAGS} ${PLATFORM_CFLAGS}") -# defined above, platform spesific but shared names +# defined above, platform specific but shared names mark_as_advanced( CYCLES_OSL OSL_LIB_EXEC |