diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-11-08 23:08:56 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-08 23:08:56 +0400 |
| commit | 76f77514d3ffbb9697154bb5d12a1bee1b57b607 (patch) | |
| tree | d56f7befafe4104fd80459b861e874fbf0463072 /intern/cycles | |
| parent | 7d7079a58a618acca43621591713065b69a06e6d (diff) | |
don't overwrite existing CMAKE_CXX_FLAGS for cycles (they may be important)
Diffstat (limited to 'intern/cycles')
| -rw-r--r-- | intern/cycles/CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt index 8bb99e4e4f3..d014326fcd5 100644 --- a/intern/cycles/CMakeLists.txt +++ b/intern/cycles/CMakeLists.txt @@ -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) |