[Bf-blender-cvs] [cfc469c] compositor-2016: Revert string splitting

Campbell Barton noreply at git.blender.org
Wed Jun 8 21:47:53 CEST 2016


Commit: cfc469c3b60043b82ce5322e78114098daf4b3ae
Author: Campbell Barton
Date:   Wed May 18 22:05:28 2016 +1000
Branches: compositor-2016
https://developer.blender.org/rBcfc469c3b60043b82ce5322e78114098daf4b3ae

Revert string splitting

Caused error on OSX

===================================================================

M	CMakeLists.txt

===================================================================

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6527cf1..5401262 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)




More information about the Bf-blender-cvs mailing list