don't overwrite existing CMAKE_CXX_FLAGS for cycles (they may be important)
authorCampbell Barton <ideasman42@gmail.com>
Tue, 8 Nov 2011 19:08:56 +0000 (19:08 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 8 Nov 2011 19:08:56 +0000 (19:08 +0000)
intern/cycles/CMakeLists.txt

index 8bb99e4e4f3a3e3d551bc8654b41fce1725149e8..d014326fcd55d5b11ec55ae1abc7d1b67e7357c2 100644 (file)
@@ -12,7 +12,7 @@ set(GCC_WARNING_FLAGS "-Wall -Wextra -Wno-unused-parameter -Wno-long-long")
 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 @@ if(WIN32)
                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)