diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-11-09 00:27:37 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-09 00:27:37 +0400 |
commit | 33814e0093f0d8d5d8dca46dfc3a13a39a256227 (patch) | |
tree | 4bc801ca44b0c1d8aa75d829e3482c7eabd7b018 /intern/cycles/CMakeLists.txt | |
parent | 76f77514d3ffbb9697154bb5d12a1bee1b57b607 (diff) |
edits to cycles cmake files so cmake_consistency_check.py can parse them.
Diffstat (limited to 'intern/cycles/CMakeLists.txt')
-rw-r--r-- | intern/cycles/CMakeLists.txt | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt index d014326fcd5..b0507d90d4c 100644 --- a/intern/cycles/CMakeLists.txt +++ b/intern/cycles/CMakeLists.txt @@ -1,6 +1,6 @@ set(CYCLES_INSTALL_PATH "scripts/addons/cycles") -SET(WITH_CYCLES_BLENDER ON) +set(WITH_CYCLES_BLENDER ON) # External Libraries @@ -14,7 +14,7 @@ set(GCC_OPTIM_FLAGS "-ffast-math -msse -msse2 -msse3 -mtune=native") if(APPLE) 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) +endif() if(WIN32) if(MSVC) @@ -24,12 +24,12 @@ if(WIN32) 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) +endif() if(UNIX AND NOT APPLE) 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) +endif() # Definitions and Includes @@ -73,4 +73,3 @@ add_subdirectory(kernel) add_subdirectory(render) add_subdirectory(subd) add_subdirectory(util) - |