From cade8e25c6a915f1881059e5587cef4233b95f3c Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 18 May 2016 22:05:28 +1000 Subject: Revert string splitting Caused error on OSX --- CMakeLists.txt | 13 ++----------- 1 file 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) -- cgit v1.2.3