[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41679] trunk/blender/intern/cycles/ CMakeLists.txt: don't overwrite existing CMAKE_CXX_FLAGS for cycles ( they may be important)

[Campbell Barton]

Revision: 41679
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41679
Author:   campbellbarton
Date:     2011-11-08 19:08:56 +0000 (Tue, 08 Nov 2011)
Log Message:
-----------
don't overwrite existing CMAKE_CXX_FLAGS for cycles (they may be important)

Modified Paths:
--------------
    trunk/blender/intern/cycles/CMakeLists.txt

Modified: trunk/blender/intern/cycles/CMakeLists.txt
===================================================================
--- trunk/blender/intern/cycles/CMakeLists.txt	2011-11-08 19:04:19 UTC (rev 41678)
+++ trunk/blender/intern/cycles/CMakeLists.txt	2011-11-08 19:08:56 UTC (rev 41679)
@@ -12,7 +12,7 @@
 set(GCC_OPTIM_FLAGS "-ffast-math -msse -msse2 -msse3 -mtune=native")
 
 if(APPLE)
-	set(CMAKE_CXX_FLAGS "${GCC_WARNING_FLAGS} ${GCC_OPTIM_FLAGS}")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GCC_WARNING_FLAGS} ${GCC_OPTIM_FLAGS}")
 	set(RTTI_DISABLE_FLAGS "-fno-rtti -DBOOST_NO_RTTI -DBOOST_NO_TYPEID")
 endif(APPLE)
 
@@ -21,13 +21,13 @@
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Ox /Ot /arch:SSE2 -D_CRT_SECURE_NO_WARNINGS /EHsc /fp:fast")
 		set(RTTI_DISABLE_FLAGS "/GR- -DBOOST_NO_RTTI -DBOOST_NO_TYPEID")
 	elseif(CMAKE_COMPILER_IS_GNUCC)
-		set(CMAKE_CXX_FLAGS "${GCC_WARNING_FLAGS} ${GCC_OPTIM_FLAGS}")
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GCC_WARNING_FLAGS} ${GCC_OPTIM_FLAGS}")
 		set(RTTI_DISABLE_FLAGS "-fno-rtti -DBOOST_NO_RTTI -DBOOST_NO_TYPEID")
 	endif()
 endif(WIN32)
 
 if(UNIX AND NOT APPLE)
-	set(CMAKE_CXX_FLAGS "${GCC_WARNING_FLAGS} ${GCC_OPTIM_FLAGS}")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GCC_WARNING_FLAGS} ${GCC_OPTIM_FLAGS}")
 	set(RTTI_DISABLE_FLAGS "-fno-rtti -DBOOST_NO_RTTI -DBOOST_NO_TYPEID")
 endif(UNIX AND NOT APPLE)