diff options
Diffstat (limited to 'build_files/cmake/platform')
| -rw-r--r-- | build_files/cmake/platform/platform_apple.cmake | 2 | ||||
| -rw-r--r-- | build_files/cmake/platform/platform_apple_xcode.cmake | 4 | ||||
| -rw-r--r-- | build_files/cmake/platform/platform_unix.cmake | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake index b10a2e175c1..c7bef56c090 100644 --- a/build_files/cmake/platform/platform_apple.cmake +++ b/build_files/cmake/platform/platform_apple.cmake @@ -408,7 +408,7 @@ if(${XCODE_VERSION} VERSION_EQUAL 5 OR ${XCODE_VERSION} VERSION_GREATER 5) # Xcode 5 is always using CLANG, which has too low template depth of 128 for libmv set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftemplate-depth=1024") endif() -# Get rid of eventually clashes, we export some symbols explicite as local +# Get rid of eventually clashes, we export some symbols explicitly as local set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -Xlinker -unexported_symbols_list -Xlinker '${CMAKE_SOURCE_DIR}/source/creator/osx_locals.map'" ) diff --git a/build_files/cmake/platform/platform_apple_xcode.cmake b/build_files/cmake/platform/platform_apple_xcode.cmake index 7af69c092cc..04fda25b7f5 100644 --- a/build_files/cmake/platform/platform_apple_xcode.cmake +++ b/build_files/cmake/platform/platform_apple_xcode.cmake @@ -83,7 +83,7 @@ if(${XCODE_VERSION} VERSION_LESS 4.3) # use guaranteed existing sdk set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk CACHE PATH "" FORCE) else() - # note: xcode-select path could be ambigous, + # note: xcode-select path could be ambiguous, # cause /Applications/Xcode.app/Contents/Developer or /Applications/Xcode.app would be allowed # so i use a selfcomposed bundlepath here set(OSX_SYSROOT_PREFIX ${XCODE_BUNDLE}/Contents/Developer/Platforms/MacOSX.platform) @@ -97,7 +97,7 @@ else() endif() if(OSX_SYSTEM MATCHES 10.9) - # make sure syslibs and headers are looked up in sdk ( expecially for 10.9 openGL atm. ) + # make sure syslibs and headers are looked up in sdk ( especially for 10.9 openGL atm. ) set(CMAKE_FIND_ROOT_PATH ${CMAKE_OSX_SYSROOT}) endif() diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake index bc6ebeab97c..f8643a558ff 100644 --- a/build_files/cmake/platform/platform_unix.cmake +++ b/build_files/cmake/platform/platform_unix.cmake @@ -305,7 +305,7 @@ if(WITH_BOOST) if(Boost_USE_STATIC_LIBS AND WITH_BOOST_ICU) find_package(IcuLinux) endif() - mark_as_advanced(Boost_DIR) # why doesnt boost do this? + mark_as_advanced(Boost_DIR) # why doesn't boost do this? endif() set(BOOST_INCLUDE_DIR ${Boost_INCLUDE_DIRS}) |