2014-01-20 19:41:54 +00:00
|
|
|
# Standalone or with Blender
|
|
|
|
if(NOT WITH_BLENDER AND WITH_CYCLES_STANDALONE)
|
|
|
|
set(CYCLES_INSTALL_PATH "")
|
|
|
|
else()
|
|
|
|
set(WITH_CYCLES_BLENDER ON)
|
2018-10-22 16:17:08 +00:00
|
|
|
# WINDOWS_PYTHON_DEBUG needs to write into the user addons folder since it will
|
|
|
|
# be started with --env-system-scripts pointing to the release folder, which will
|
|
|
|
# lack the cycles addon, and we don't want to write into it.
|
|
|
|
if(NOT WINDOWS_PYTHON_DEBUG)
|
|
|
|
set(CYCLES_INSTALL_PATH "scripts/addons/cycles")
|
|
|
|
else()
|
|
|
|
set(CYCLES_INSTALL_PATH "$ENV{appdata}/blender foundation/blender/${BLENDER_VERSION}/scripts/addons/cycles")
|
|
|
|
endif()
|
2014-01-20 19:41:54 +00:00
|
|
|
endif()
|
2011-08-16 16:15:34 +00:00
|
|
|
|
|
|
|
# External Libraries
|
|
|
|
|
|
|
|
include(cmake/external_libs.cmake)
|
2018-02-03 23:38:27 +00:00
|
|
|
include(cmake/macros.cmake)
|
2011-08-16 16:15:34 +00:00
|
|
|
|
|
|
|
# Build Flags
|
Remove SCons building system
While SCons building system was serving us really good for ages it's no longer
having much attention by the developers and started to become quite a difficult
task to maintain.
What's even worse -- there started to be quite serious divergence between SCons
and CMake which was only accumulating over the releases now. The fact that none
of the active developers are really using SCons and that our main studio is also
using CMake spotting bugs in the SCons builds became quite a difficult task and
we aren't always spotting them in time.
Meanwhile CMake became really mature building system which is available on every
platform we support and arguably it's also easier and more robust to use.
This commit includes:
- Removal of actual SCons building system
- Removal of SCons git submodule
- Removal of documentation which is stored in the sources and covers SCons
- Tweaks to the buildbot master to stop using SCons submodule
(this change requires deploying to the server)
- Tweaks to the install dependencies script to skip installing or mentioning
SCons building system
- Tweaks to various helper scripts to avoid mention of SCons folders/files
as well
Reviewers: mont29, dingto, dfelinto, lukastoenne, lukasstockner97, brecht, Severin, merwin, aligorith, psy-fi, campbellbarton, juicyfruit
Reviewed By: campbellbarton, juicyfruit
Differential Revision: https://developer.blender.org/D1680
2016-01-04 09:20:48 +00:00
|
|
|
# todo: this code could be refactored a bit to avoid duplication
|
2014-03-26 21:28:59 +00:00
|
|
|
# note: CXX_HAS_SSE is needed in case passing SSE flags fails altogether (gcc-arm)
|
2011-08-16 16:15:34 +00:00
|
|
|
|
2016-03-25 15:09:05 +00:00
|
|
|
if(WITH_CYCLES_NATIVE_ONLY)
|
|
|
|
set(CXX_HAS_SSE FALSE)
|
|
|
|
set(CXX_HAS_AVX FALSE)
|
|
|
|
set(CXX_HAS_AVX2 FALSE)
|
|
|
|
add_definitions(
|
|
|
|
-DWITH_KERNEL_NATIVE
|
|
|
|
)
|
2018-01-09 21:50:48 +00:00
|
|
|
|
|
|
|
if(NOT MSVC)
|
|
|
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
|
|
|
|
set(CYCLES_KERNEL_FLAGS "-march=native")
|
|
|
|
endif()
|
2016-03-25 15:09:05 +00:00
|
|
|
elseif(NOT WITH_CPU_SSE)
|
2014-10-15 12:43:47 +00:00
|
|
|
set(CXX_HAS_SSE FALSE)
|
2014-12-14 22:51:43 +00:00
|
|
|
set(CXX_HAS_AVX FALSE)
|
|
|
|
set(CXX_HAS_AVX2 FALSE)
|
Windows: Add support for building with clang.
This commit contains the minimum to make clang build/work with blender, asan and ninja build support is forthcoming
Things to note:
1) Builds and runs, and is able to pass all tests (except for the freestyle_stroke_material.blend test which was broken at that time for all platforms by the looks of it)
2) It's slightly faster than msvc when using cycles. (time in seconds, on an i7-3370)
victor_cpu
msvc:3099.51
clang:2796.43
pavillon_barcelona_cpu
msvc:1872.05
clang:1827.72
koro_cpu
msvc:1097.58
clang:1006.51
fishy_cat_cpu
msvc:815.37
clang:722.2
classroom_cpu
msvc:1705.39
clang:1575.43
bmw27_cpu
msvc:552.38
clang:561.53
barbershop_interior_cpu
msvc:2134.93
clang:1922.33
3) clang on windows uses a drop in replacement for the Microsoft cl.exe (takes some of the Microsoft parameters, but not all, and takes some of the clang parameters but not all) and uses ms headers + libraries + linker, so you still need visual studio installed and will use our existing vc14 svn libs.
4) X64 only currently, X86 builds but crashes on startup.
5) Tested with llvm/clang 6.0.0
6) Requires visual studio integration, available at https://github.com/LazyDodo/llvm-vs2017-integration
7) The Microsoft compiler spawns a few copies of cl in parallel to get faster build times, clang doesn't, so the build time is 3-4x slower than with msvc.
8) No openmp support yet. Have not looked at this much, the binary distribution of clang doesn't seem to include it on windows.
9) No ASAN support yet, some of the sanitizers can be made to work, but it was decided to leave support out of this commit.
Reviewers: campbellbarton
Differential Revision: https://developer.blender.org/D3304
2018-05-28 20:34:47 +00:00
|
|
|
elseif(WIN32 AND MSVC AND NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang")
|
2014-03-26 21:28:59 +00:00
|
|
|
set(CXX_HAS_SSE TRUE)
|
2014-12-07 10:22:05 +00:00
|
|
|
set(CXX_HAS_AVX TRUE)
|
|
|
|
set(CXX_HAS_AVX2 TRUE)
|
2014-03-26 21:28:59 +00:00
|
|
|
|
2014-02-03 13:22:50 +00:00
|
|
|
# /arch:AVX for VC2012 and above
|
|
|
|
if(NOT MSVC_VERSION LESS 1700)
|
|
|
|
set(CYCLES_AVX_ARCH_FLAGS "/arch:AVX")
|
2014-06-13 20:23:58 +00:00
|
|
|
set(CYCLES_AVX2_ARCH_FLAGS "/arch:AVX /arch:AVX2")
|
2014-02-03 13:22:50 +00:00
|
|
|
elseif(NOT CMAKE_CL_64)
|
|
|
|
set(CYCLES_AVX_ARCH_FLAGS "/arch:SSE2")
|
2014-06-13 20:23:58 +00:00
|
|
|
set(CYCLES_AVX2_ARCH_FLAGS "/arch:SSE2")
|
2014-02-03 13:22:50 +00:00
|
|
|
endif()
|
|
|
|
|
2017-09-07 00:33:50 +00:00
|
|
|
# Unlike GCC/clang we still use fast math, because there is no fine
|
|
|
|
# grained control and the speedup we get here is too big to ignore.
|
|
|
|
set(CYCLES_KERNEL_FLAGS "/fp:fast -D_CRT_SECURE_NO_WARNINGS /GS-")
|
|
|
|
|
2013-06-18 13:19:16 +00:00
|
|
|
# there is no /arch:SSE3, but intrinsics are available anyway
|
2013-08-31 03:18:55 +00:00
|
|
|
if(CMAKE_CL_64)
|
2017-09-07 00:33:50 +00:00
|
|
|
set(CYCLES_SSE2_KERNEL_FLAGS "${CYCLES_KERNEL_FLAGS}")
|
|
|
|
set(CYCLES_SSE3_KERNEL_FLAGS "${CYCLES_KERNEL_FLAGS}")
|
|
|
|
set(CYCLES_SSE41_KERNEL_FLAGS "${CYCLES_KERNEL_FLAGS}")
|
|
|
|
set(CYCLES_AVX_KERNEL_FLAGS "${CYCLES_AVX_ARCH_FLAGS} ${CYCLES_KERNEL_FLAGS}")
|
|
|
|
set(CYCLES_AVX2_KERNEL_FLAGS "${CYCLES_AVX2_ARCH_FLAGS} ${CYCLES_KERNEL_FLAGS}")
|
2013-08-31 03:18:55 +00:00
|
|
|
else()
|
2017-09-07 00:33:50 +00:00
|
|
|
set(CYCLES_SSE2_KERNEL_FLAGS "/arch:SSE2 ${CYCLES_KERNEL_FLAGS}")
|
|
|
|
set(CYCLES_SSE3_KERNEL_FLAGS "/arch:SSE2 ${CYCLES_KERNEL_FLAGS}")
|
|
|
|
set(CYCLES_SSE41_KERNEL_FLAGS "/arch:SSE2 ${CYCLES_KERNEL_FLAGS}")
|
|
|
|
set(CYCLES_AVX_KERNEL_FLAGS "${CYCLES_AVX_ARCH_FLAGS} ${CYCLES_KERNEL_FLAGS}")
|
|
|
|
set(CYCLES_AVX2_KERNEL_FLAGS "${CYCLES_AVX2_ARCH_FLAGS} ${CYCLES_KERNEL_FLAGS}")
|
2013-08-31 03:18:55 +00:00
|
|
|
endif()
|
2013-06-19 17:54:26 +00:00
|
|
|
|
2017-09-07 00:33:50 +00:00
|
|
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CYCLES_KERNEL_FLAGS}")
|
2013-06-19 17:17:51 +00:00
|
|
|
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Ox")
|
2013-08-05 12:02:43 +00:00
|
|
|
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Ox")
|
|
|
|
set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} /Ox")
|
2017-09-07 00:33:50 +00:00
|
|
|
elseif(CMAKE_COMPILER_IS_GNUCC OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang"))
|
2014-03-26 21:28:59 +00:00
|
|
|
check_cxx_compiler_flag(-msse CXX_HAS_SSE)
|
2014-12-07 10:22:05 +00:00
|
|
|
check_cxx_compiler_flag(-mavx CXX_HAS_AVX)
|
|
|
|
check_cxx_compiler_flag(-mavx2 CXX_HAS_AVX2)
|
2017-09-07 00:33:50 +00:00
|
|
|
|
|
|
|
# Assume no signal trapping for better code generation.
|
|
|
|
set(CYCLES_KERNEL_FLAGS "-fno-trapping-math")
|
|
|
|
# Avoid overhead of setting errno for NaNs.
|
|
|
|
set(CYCLES_KERNEL_FLAGS "${CYCLES_KERNEL_FLAGS} -fno-math-errno")
|
|
|
|
# Let compiler optimize 0.0 - x without worrying about signed zeros.
|
|
|
|
set(CYCLES_KERNEL_FLAGS "${CYCLES_KERNEL_FLAGS} -fno-signed-zeros")
|
|
|
|
|
|
|
|
if(CMAKE_COMPILER_IS_GNUCC)
|
|
|
|
# Assume no signal trapping for better code generation.
|
|
|
|
set(CYCLES_KERNEL_FLAGS "${CYCLES_KERNEL_FLAGS} -fno-signaling-nans")
|
|
|
|
# Assume a fixed rounding mode for better constant folding.
|
|
|
|
set(CYCLES_KERNEL_FLAGS "${CYCLES_KERNEL_FLAGS} -fno-rounding-math")
|
2014-03-26 21:28:59 +00:00
|
|
|
endif()
|
2017-09-07 00:33:50 +00:00
|
|
|
|
2014-03-26 21:28:59 +00:00
|
|
|
if(CXX_HAS_SSE)
|
2017-09-07 00:33:50 +00:00
|
|
|
if(CMAKE_COMPILER_IS_GNUCC)
|
|
|
|
set(CYCLES_KERNEL_FLAGS "${CYCLES_KERNEL_FLAGS} -mfpmath=sse")
|
|
|
|
endif()
|
|
|
|
|
|
|
|
set(CYCLES_SSE2_KERNEL_FLAGS "${CYCLES_KERNEL_FLAGS} -msse -msse2")
|
|
|
|
set(CYCLES_SSE3_KERNEL_FLAGS "${CYCLES_SSE2_KERNEL_FLAGS} -msse3 -mssse3")
|
|
|
|
set(CYCLES_SSE41_KERNEL_FLAGS "${CYCLES_SSE3_KERNEL_FLAGS} -msse4.1")
|
|
|
|
if(CXX_HAS_AVX)
|
|
|
|
set(CYCLES_AVX_KERNEL_FLAGS "${CYCLES_SSE41_KERNEL_FLAGS} -mavx")
|
|
|
|
endif()
|
|
|
|
if(CXX_HAS_AVX2)
|
|
|
|
set(CYCLES_AVX2_KERNEL_FLAGS "${CYCLES_SSE41_KERNEL_FLAGS} -mavx -mavx2 -mfma -mlzcnt -mbmi -mbmi2 -mf16c")
|
|
|
|
endif()
|
2014-12-07 10:22:05 +00:00
|
|
|
endif()
|
2017-09-07 00:33:50 +00:00
|
|
|
|
|
|
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CYCLES_KERNEL_FLAGS}")
|
2018-04-02 14:11:11 +00:00
|
|
|
elseif(WIN32 AND CMAKE_CXX_COMPILER_ID MATCHES "Intel")
|
|
|
|
check_cxx_compiler_flag(/QxSSE2 CXX_HAS_SSE)
|
|
|
|
check_cxx_compiler_flag(/arch:AVX CXX_HAS_AVX)
|
|
|
|
check_cxx_compiler_flag(/QxCORE-AVX2 CXX_HAS_AVX2)
|
|
|
|
|
|
|
|
if(CXX_HAS_SSE)
|
|
|
|
set(CYCLES_SSE2_KERNEL_FLAGS "/QxSSE2")
|
|
|
|
set(CYCLES_SSE3_KERNEL_FLAGS "/QxSSSE3")
|
|
|
|
set(CYCLES_SSE41_KERNEL_FLAGS "/QxSSE4.1")
|
|
|
|
|
|
|
|
if(CXX_HAS_AVX)
|
|
|
|
set(CYCLES_AVX_KERNEL_FLAGS "/arch:AVX")
|
|
|
|
endif()
|
|
|
|
|
|
|
|
if(CXX_HAS_AVX2)
|
|
|
|
set(CYCLES_AVX2_KERNEL_FLAGS "/QxCORE-AVX2")
|
|
|
|
endif()
|
|
|
|
endif()
|
|
|
|
elseif(CMAKE_CXX_COMPILER_ID MATCHES "Intel")
|
|
|
|
if(APPLE)
|
|
|
|
# ICC does not support SSE2 flag on MacOSX
|
|
|
|
check_cxx_compiler_flag(-xssse3 CXX_HAS_SSE)
|
|
|
|
else()
|
|
|
|
check_cxx_compiler_flag(-xsse2 CXX_HAS_SSE)
|
|
|
|
endif()
|
|
|
|
|
|
|
|
check_cxx_compiler_flag(-xavx CXX_HAS_AVX)
|
|
|
|
check_cxx_compiler_flag(-xcore-avx2 CXX_HAS_AVX2)
|
|
|
|
|
|
|
|
if(CXX_HAS_SSE)
|
|
|
|
if(APPLE)
|
|
|
|
# ICC does not support SSE2 flag on MacOSX
|
|
|
|
set(CYCLES_SSE2_KERNEL_FLAGS "-xssse3")
|
|
|
|
else()
|
|
|
|
set(CYCLES_SSE2_KERNEL_FLAGS "-xsse2")
|
|
|
|
endif()
|
|
|
|
|
|
|
|
set(CYCLES_SSE3_KERNEL_FLAGS "-xssse3")
|
|
|
|
set(CYCLES_SSE41_KERNEL_FLAGS "-xsse4.1")
|
|
|
|
|
|
|
|
if(CXX_HAS_AVX)
|
|
|
|
set(CYCLES_AVX_KERNEL_FLAGS "-xavx")
|
|
|
|
endif()
|
|
|
|
|
|
|
|
if(CXX_HAS_AVX2)
|
|
|
|
set(CYCLES_AVX2_KERNEL_FLAGS "-xcore-avx2")
|
|
|
|
endif()
|
|
|
|
endif()
|
2011-11-08 20:27:37 +00:00
|
|
|
endif()
|
2011-04-28 13:47:27 +00:00
|
|
|
|
2014-03-26 21:28:59 +00:00
|
|
|
if(CXX_HAS_SSE)
|
|
|
|
add_definitions(
|
|
|
|
-DWITH_KERNEL_SSE2
|
|
|
|
-DWITH_KERNEL_SSE3
|
|
|
|
-DWITH_KERNEL_SSE41
|
|
|
|
)
|
|
|
|
endif()
|
2014-01-28 21:56:12 +00:00
|
|
|
|
2014-12-07 10:22:05 +00:00
|
|
|
if(CXX_HAS_AVX)
|
|
|
|
add_definitions(-DWITH_KERNEL_AVX)
|
|
|
|
endif()
|
|
|
|
|
|
|
|
if(CXX_HAS_AVX2)
|
|
|
|
add_definitions(-DWITH_KERNEL_AVX2)
|
|
|
|
endif()
|
|
|
|
|
2014-06-17 06:00:16 +00:00
|
|
|
if(WITH_CYCLES_OSL)
|
|
|
|
if(WIN32 AND MSVC)
|
|
|
|
set(RTTI_DISABLE_FLAGS "/GR- -DBOOST_NO_RTTI -DBOOST_NO_TYPEID")
|
|
|
|
elseif(CMAKE_COMPILER_IS_GNUCC OR (CMAKE_C_COMPILER_ID MATCHES "Clang"))
|
|
|
|
set(RTTI_DISABLE_FLAGS "-fno-rtti -DBOOST_NO_RTTI -DBOOST_NO_TYPEID")
|
|
|
|
endif()
|
2012-11-26 13:48:48 +00:00
|
|
|
endif()
|
2011-11-10 14:32:16 +00:00
|
|
|
|
2011-08-16 16:15:34 +00:00
|
|
|
# Definitions and Includes
|
|
|
|
|
2014-03-13 12:31:06 +00:00
|
|
|
add_definitions(
|
|
|
|
${BOOST_DEFINITIONS}
|
|
|
|
${OPENIMAGEIO_DEFINITIONS}
|
|
|
|
)
|
2011-08-16 16:15:34 +00:00
|
|
|
|
2014-03-13 12:31:06 +00:00
|
|
|
add_definitions(
|
|
|
|
-DCCL_NAMESPACE_BEGIN=namespace\ ccl\ {
|
|
|
|
-DCCL_NAMESPACE_END=}
|
|
|
|
)
|
2011-08-16 16:15:34 +00:00
|
|
|
|
2014-01-20 20:12:28 +00:00
|
|
|
if(WITH_CYCLES_STANDALONE_GUI)
|
|
|
|
add_definitions(-DWITH_CYCLES_STANDALONE_GUI)
|
|
|
|
endif()
|
|
|
|
|
2013-11-28 00:38:23 +00:00
|
|
|
if(WITH_CYCLES_PTEX)
|
|
|
|
add_definitions(-DWITH_PTEX)
|
|
|
|
endif()
|
|
|
|
|
2011-08-16 16:15:34 +00:00
|
|
|
if(WITH_CYCLES_OSL)
|
2011-12-29 01:46:58 +00:00
|
|
|
add_definitions(-DWITH_OSL)
|
2018-08-28 01:37:55 +00:00
|
|
|
#osl 1.9.x
|
|
|
|
add_definitions(-DOSL_STATIC_BUILD)
|
|
|
|
#pre 1.9
|
2013-01-30 21:58:47 +00:00
|
|
|
add_definitions(-DOSL_STATIC_LIBRARY)
|
2014-06-28 17:59:54 +00:00
|
|
|
include_directories(
|
|
|
|
SYSTEM
|
2014-12-29 09:48:21 +00:00
|
|
|
${OSL_INCLUDE_DIR}
|
2014-06-28 17:59:54 +00:00
|
|
|
)
|
2011-08-16 16:15:34 +00:00
|
|
|
endif()
|
|
|
|
|
2018-11-07 11:58:12 +00:00
|
|
|
if(WITH_CYCLES_EMBREE)
|
|
|
|
add_definitions(-DWITH_EMBREE)
|
|
|
|
add_definitions(-DEMBREE_STATIC_LIB)
|
|
|
|
include_directories(
|
|
|
|
SYSTEM
|
|
|
|
${EMBREE_INCLUDE_DIRS}
|
|
|
|
)
|
|
|
|
endif()
|
|
|
|
|
2016-07-17 02:57:06 +00:00
|
|
|
if(WITH_CYCLES_OPENSUBDIV)
|
|
|
|
add_definitions(-DWITH_OPENSUBDIV)
|
|
|
|
include_directories(
|
|
|
|
SYSTEM
|
|
|
|
${OPENSUBDIV_INCLUDE_DIR}
|
|
|
|
)
|
|
|
|
endif()
|
|
|
|
|
2018-02-14 09:31:04 +00:00
|
|
|
if(WITH_CYCLES_STANDALONE)
|
|
|
|
set(WITH_CYCLES_DEVICE_OPENCL TRUE)
|
|
|
|
set(WITH_CYCLES_DEVICE_CUDA TRUE)
|
|
|
|
# Experimental and unfinished.
|
|
|
|
set(WITH_CYCLES_NETWORK FALSE)
|
|
|
|
endif()
|
|
|
|
# TODO(sergey): Consider removing it, only causes confusion in interface.
|
2016-01-12 15:50:43 +00:00
|
|
|
set(WITH_CYCLES_DEVICE_MULTI TRUE)
|
2011-04-27 11:58:34 +00:00
|
|
|
|
2014-10-04 13:00:26 +00:00
|
|
|
# Logging capabilities using GLog library.
|
2014-09-08 12:01:24 +00:00
|
|
|
if(WITH_CYCLES_LOGGING)
|
|
|
|
add_definitions(-DWITH_CYCLES_LOGGING)
|
2017-04-21 12:26:25 +00:00
|
|
|
add_definitions(${GLOG_DEFINES})
|
2014-12-12 11:01:30 +00:00
|
|
|
add_definitions(-DCYCLES_GFLAGS_NAMESPACE=${GFLAGS_NAMESPACE})
|
2014-11-15 20:12:19 +00:00
|
|
|
include_directories(
|
|
|
|
SYSTEM
|
|
|
|
${GLOG_INCLUDE_DIRS}
|
|
|
|
${GFLAGS_INCLUDE_DIRS}
|
|
|
|
)
|
2014-09-08 12:01:24 +00:00
|
|
|
endif()
|
|
|
|
|
2014-10-04 13:00:26 +00:00
|
|
|
# Debugging capabilities (debug passes etc).
|
|
|
|
if(WITH_CYCLES_DEBUG)
|
|
|
|
add_definitions(-DWITH_CYCLES_DEBUG)
|
|
|
|
endif()
|
|
|
|
|
2017-11-13 09:40:19 +00:00
|
|
|
if(NOT OPENIMAGEIO_PUGIXML_FOUND)
|
|
|
|
add_definitions(-DWITH_SYSTEM_PUGIXML)
|
|
|
|
endif()
|
|
|
|
|
2011-08-16 16:15:34 +00:00
|
|
|
include_directories(
|
2012-09-20 09:04:43 +00:00
|
|
|
SYSTEM
|
2011-08-16 16:15:34 +00:00
|
|
|
${BOOST_INCLUDE_DIR}
|
2011-09-18 04:55:22 +00:00
|
|
|
${OPENIMAGEIO_INCLUDE_DIRS}
|
2012-09-24 19:06:28 +00:00
|
|
|
${OPENIMAGEIO_INCLUDE_DIRS}/OpenImageIO
|
2014-01-27 18:11:36 +00:00
|
|
|
${OPENEXR_INCLUDE_DIR}
|
2014-03-13 12:31:06 +00:00
|
|
|
${OPENEXR_INCLUDE_DIRS}
|
2014-11-15 17:56:22 +00:00
|
|
|
${PUGIXML_INCLUDE_DIR}
|
2014-03-13 12:31:06 +00:00
|
|
|
)
|
2011-04-27 11:58:34 +00:00
|
|
|
|
2014-12-31 20:01:31 +00:00
|
|
|
if(CYCLES_STANDALONE_REPOSITORY)
|
|
|
|
include_directories(../third_party/atomic)
|
|
|
|
else()
|
|
|
|
include_directories(../atomic)
|
|
|
|
endif()
|
2014-05-02 21:22:14 +00:00
|
|
|
|
|
|
|
# Warnings
|
2014-05-03 08:54:02 +00:00
|
|
|
if(CMAKE_COMPILER_IS_GNUCXX)
|
|
|
|
ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_cxxflag_float_conversion "-Werror=float-conversion")
|
2014-10-08 08:58:40 +00:00
|
|
|
ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_cxxflag_double_promotion "-Werror=double-promotion")
|
2016-02-17 11:40:56 +00:00
|
|
|
ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_no_error_unused_macros "-Wno-error=unused-macros")
|
2014-05-03 08:54:02 +00:00
|
|
|
unset(_has_cxxflag_float_conversion)
|
2014-10-08 08:58:40 +00:00
|
|
|
unset(_has_cxxflag_double_promotion)
|
2016-02-17 11:40:56 +00:00
|
|
|
unset(_has_no_error_unused_macros)
|
2014-05-02 21:22:14 +00:00
|
|
|
endif()
|
|
|
|
|
2018-02-03 17:59:09 +00:00
|
|
|
if(WITH_CYCLES_CUDA_BINARIES AND (NOT WITH_CYCLES_CUBIN_COMPILER))
|
|
|
|
if(MSVC)
|
|
|
|
set(MAX_MSVC 1800)
|
|
|
|
if(${CUDA_VERSION} EQUAL "8.0")
|
|
|
|
set(MAX_MSVC 1900)
|
|
|
|
elseif(${CUDA_VERSION} EQUAL "9.0")
|
|
|
|
set(MAX_MSVC 1910)
|
|
|
|
elseif(${CUDA_VERSION} EQUAL "9.1")
|
|
|
|
set(MAX_MSVC 1911)
|
2018-10-03 16:18:22 +00:00
|
|
|
elseif(${CUDA_VERSION} EQUAL "10.0")
|
|
|
|
set(MAX_MSVC 1999)
|
2018-02-03 17:59:09 +00:00
|
|
|
endif()
|
Windows: Add support for building with clang.
This commit contains the minimum to make clang build/work with blender, asan and ninja build support is forthcoming
Things to note:
1) Builds and runs, and is able to pass all tests (except for the freestyle_stroke_material.blend test which was broken at that time for all platforms by the looks of it)
2) It's slightly faster than msvc when using cycles. (time in seconds, on an i7-3370)
victor_cpu
msvc:3099.51
clang:2796.43
pavillon_barcelona_cpu
msvc:1872.05
clang:1827.72
koro_cpu
msvc:1097.58
clang:1006.51
fishy_cat_cpu
msvc:815.37
clang:722.2
classroom_cpu
msvc:1705.39
clang:1575.43
bmw27_cpu
msvc:552.38
clang:561.53
barbershop_interior_cpu
msvc:2134.93
clang:1922.33
3) clang on windows uses a drop in replacement for the Microsoft cl.exe (takes some of the Microsoft parameters, but not all, and takes some of the clang parameters but not all) and uses ms headers + libraries + linker, so you still need visual studio installed and will use our existing vc14 svn libs.
4) X64 only currently, X86 builds but crashes on startup.
5) Tested with llvm/clang 6.0.0
6) Requires visual studio integration, available at https://github.com/LazyDodo/llvm-vs2017-integration
7) The Microsoft compiler spawns a few copies of cl in parallel to get faster build times, clang doesn't, so the build time is 3-4x slower than with msvc.
8) No openmp support yet. Have not looked at this much, the binary distribution of clang doesn't seem to include it on windows.
9) No ASAN support yet, some of the sanitizers can be made to work, but it was decided to leave support out of this commit.
Reviewers: campbellbarton
Differential Revision: https://developer.blender.org/D3304
2018-05-28 20:34:47 +00:00
|
|
|
if(NOT MSVC_VERSION LESS ${MAX_MSVC} OR CMAKE_C_COMPILER_ID MATCHES "Clang")
|
2018-02-03 17:59:09 +00:00
|
|
|
message(STATUS "nvcc not supported for this compiler version, using cycles_cubin_cc instead.")
|
|
|
|
set(WITH_CYCLES_CUBIN_COMPILER ON)
|
|
|
|
endif()
|
|
|
|
unset(MAX_MSVC)
|
2018-09-27 13:17:49 +00:00
|
|
|
elseif(APPLE)
|
|
|
|
if(${XCODE_VERSION} VERSION_GREATER_EQUAL 10.0)
|
|
|
|
message(STATUS "nvcc not supported for this compiler version, using cycles_cubin_cc instead.")
|
|
|
|
set(WITH_CYCLES_CUBIN_COMPILER ON)
|
|
|
|
endif()
|
2018-02-03 17:59:09 +00:00
|
|
|
endif()
|
|
|
|
endif()
|
|
|
|
|
2014-05-02 21:22:14 +00:00
|
|
|
|
2011-04-27 11:58:34 +00:00
|
|
|
# Subdirectories
|
|
|
|
|
2011-08-16 16:15:34 +00:00
|
|
|
if(WITH_CYCLES_BLENDER)
|
2016-02-06 22:40:41 +00:00
|
|
|
add_definitions(-DWITH_BLENDER_GUARDEDALLOC)
|
2011-11-18 21:06:36 +00:00
|
|
|
add_subdirectory(blender)
|
2012-06-01 14:59:06 +00:00
|
|
|
endif()
|
2011-08-16 16:15:34 +00:00
|
|
|
|
2016-03-11 09:00:47 +00:00
|
|
|
if(WITH_CYCLES_NETWORK)
|
|
|
|
add_definitions(-DWITH_NETWORK)
|
|
|
|
endif()
|
|
|
|
|
2018-06-14 15:48:19 +00:00
|
|
|
if(WITH_OPENCOLORIO)
|
|
|
|
add_definitions(-DWITH_OCIO)
|
|
|
|
include_directories(
|
|
|
|
SYSTEM
|
|
|
|
${OPENCOLORIO_INCLUDE_DIRS}
|
|
|
|
)
|
|
|
|
endif()
|
|
|
|
|
2018-02-03 17:59:09 +00:00
|
|
|
if(WITH_CYCLES_STANDALONE OR WITH_CYCLES_NETWORK OR WITH_CYCLES_CUBIN_COMPILER)
|
2012-11-09 18:31:04 +00:00
|
|
|
add_subdirectory(app)
|
|
|
|
endif()
|
|
|
|
|
2011-08-16 16:15:34 +00:00
|
|
|
add_subdirectory(bvh)
|
|
|
|
add_subdirectory(device)
|
|
|
|
add_subdirectory(doc)
|
2016-05-07 17:47:37 +00:00
|
|
|
add_subdirectory(graph)
|
2011-08-16 16:15:34 +00:00
|
|
|
add_subdirectory(kernel)
|
|
|
|
add_subdirectory(render)
|
|
|
|
add_subdirectory(subd)
|
|
|
|
add_subdirectory(util)
|
2011-11-10 12:52:17 +00:00
|
|
|
|
2016-02-06 18:09:44 +00:00
|
|
|
# TODO(sergey): Make this to work with standalone repository.
|
|
|
|
if(WITH_GTESTS)
|
|
|
|
add_subdirectory(test)
|
|
|
|
endif()
|
|
|
|
|
2014-01-20 19:41:54 +00:00
|
|
|
if(NOT WITH_BLENDER AND WITH_CYCLES_STANDALONE)
|
|
|
|
delayed_do_install(${CMAKE_BINARY_DIR}/bin)
|
|
|
|
endif()
|