Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2016-05-18 15:05:28 +0300
committerCampbell Barton <ideasman42@gmail.com>2016-05-18 15:05:53 +0300
commitcade8e25c6a915f1881059e5587cef4233b95f3c (patch)
tree903fe9d2932f59c17a5cde4a644371f09bedd58a /CMakeLists.txt
parent1283c66146732bdb04591f2d84518a6609376360 (diff)
Revert string splitting
Caused error on OSX
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt13
1 files changed, 2 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6527cf1c78c..5401262b940 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2144,15 +2144,7 @@ elseif(APPLE)
set(PLATFORM_CFLAGS "-pipe -funsigned-char")
set(PLATFORM_LINKFLAGS
- "-fexceptions -framework CoreServices "
- "-framework Foundation "
- "-framework IOKit "
- "-framework AppKit "
- "-framework Cocoa "
- "-framework Carbon "
- "-framework AudioUnit "
- "-framework AudioToolbox "
- "-framework CoreAudio "
+ "-fexceptions -framework CoreServices -framework Foundation -framework IOKit -framework AppKit -framework Cocoa -framework Carbon -framework AudioUnit -framework AudioToolbox -framework CoreAudio"
)
if(WITH_CODEC_QUICKTIME)
set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -framework QTKit")
@@ -2430,8 +2422,7 @@ elseif(APPLE)
endif()
# 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"
+ "${PLATFORM_LINKFLAGS} -Xlinker -unexported_symbols_list -Xlinker ${CMAKE_SOURCE_DIR}/source/creator/osx_locals.map"
)
if(WITH_CXX11)