diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2016-04-23 17:16:15 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2016-04-23 17:16:44 +0300 |
| commit | 35be6d87e84e110714456896deb086576bb02355 (patch) | |
| tree | 807d99c93b42545daa327373198118618806c066 /CMakeLists.txt | |
| parent | 39873891bf6759eb5fcd6bfd7ed1aa762d8db398 (diff) | |
Cleanup: cmake
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a924098b85a..438cb1cdd9f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -166,7 +166,7 @@ option_defaults_init( ) # customize... -if (UNIX AND NOT APPLE) +if(UNIX AND NOT APPLE) # some of these libraries are problematic on Linux # disable less important dependencies by default set(_init_CODEC_FFMPEG OFF) @@ -2320,11 +2320,11 @@ elseif(APPLE) # Get rid of eventually clashes, we export some symbols explicite as local set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -Xlinker -unexported_symbols_list -Xlinker ${CMAKE_SOURCE_DIR}/source/creator/osx_locals.map") - # Suppress ranlib "has no symbols" warnings - SET(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> Scr <TARGET> <LINK_FLAGS> <OBJECTS>") - SET(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> Scr <TARGET> <LINK_FLAGS> <OBJECTS>") - SET(CMAKE_C_ARCHIVE_FINISH "<CMAKE_RANLIB> -no_warning_for_no_symbols -c <TARGET>") - SET(CMAKE_CXX_ARCHIVE_FINISH "<CMAKE_RANLIB> -no_warning_for_no_symbols -c <TARGET>") + # Suppress ranlib "has no symbols" warnings (workaround for T48250) + set(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> Scr <TARGET> <LINK_FLAGS> <OBJECTS>") + set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> Scr <TARGET> <LINK_FLAGS> <OBJECTS>") + set(CMAKE_C_ARCHIVE_FINISH "<CMAKE_RANLIB> -no_warning_for_no_symbols -c <TARGET>") + set(CMAKE_CXX_ARCHIVE_FINISH "<CMAKE_RANLIB> -no_warning_for_no_symbols -c <TARGET>") endif() #----------------------------------------------------------------------------- |