diff options
| -rw-r--r-- | CMakeLists.txt | 17 | ||||
| -rw-r--r-- | intern/cycles/CMakeLists.txt | 7 |
2 files changed, 8 insertions, 16 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 21f5ffb2f47..6b26d99c9bd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -503,18 +503,11 @@ if(UNIX AND NOT APPLE) if(WITH_BOOST) - # not sure this is needed, commenting, campbell - # --- - # set(BOOST "/usr" CACHE PATH "Boost Directory") - # - # if(NOT BOOST_CUSTOM) - # set(BOOST_ROOT ${BOOST}) - # set(Boost_USE_MULTITHREADED ON) - # find_package(Boost 1.34 COMPONENTS filesystem regex system thread) - # endif() - - set(Boost_USE_MULTITHREADED ON) - find_package(Boost 1.34 COMPONENTS filesystem regex system thread) + # uses in build instructions to override include and library variables + if(NOT BOOST_CUSTOM) + set(Boost_USE_MULTITHREADED ON) + find_package(Boost 1.34 COMPONENTS filesystem regex system thread) + endif() set(BOOST_INCLUDE_DIR ${Boost_INCLUDE_DIRS}) set(BOOST_LIBRARIES ${Boost_LIBRARIES}) diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt index b0507d90d4c..bb876a90a7c 100644 --- a/intern/cycles/CMakeLists.txt +++ b/intern/cycles/CMakeLists.txt @@ -8,11 +8,10 @@ include(cmake/external_libs.cmake) # Build Flags -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 "${CMAKE_CXX_FLAGS} ${GCC_WARNING_FLAGS} ${GCC_OPTIM_FLAGS}") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GCC_OPTIM_FLAGS}") set(RTTI_DISABLE_FLAGS "-fno-rtti -DBOOST_NO_RTTI -DBOOST_NO_TYPEID") endif() @@ -21,13 +20,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 "${CMAKE_CXX_FLAGS} ${GCC_WARNING_FLAGS} ${GCC_OPTIM_FLAGS}") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GCC_OPTIM_FLAGS}") set(RTTI_DISABLE_FLAGS "-fno-rtti -DBOOST_NO_RTTI -DBOOST_NO_TYPEID") endif() endif() if(UNIX AND NOT APPLE) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GCC_WARNING_FLAGS} ${GCC_OPTIM_FLAGS}") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GCC_OPTIM_FLAGS}") set(RTTI_DISABLE_FLAGS "-fno-rtti -DBOOST_NO_RTTI -DBOOST_NO_TYPEID") endif() |