Revert string splitting
authorCampbell Barton <ideasman42@gmail.com>
Wed, 18 May 2016 12:05:28 +0000 (22:05 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 18 May 2016 12:05:53 +0000 (22:05 +1000)
Caused error on OSX

CMakeLists.txt

index 6527cf1c78c7f859a39d0ecdfbaef85b5ffdce58..5401262b940c4f0d6c53a84fa42f8f76295f63b0 100644 (file)
@@ -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)