Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

edits to cycles cmake files so cmake_consistency_check.py can parse them.

Browse Source
This commit is contained in:
Campbell Barton
2011-11-08 20:27:37 +00:00
parent 76f77514d3
commit 33814e0093
14 changed files with 197 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build_files/cmake/cmake_consistency_check.py
View File

@@ -172,6 +172,12 @@ def cmake_get_src(f):
pass pass
elif new_file.endswith(".def"): elif new_file.endswith(".def"):
pass pass
elif new_file.endswith(".cl"): # opencl
pass
elif new_file.endswith(".cu"): # cuda
pass
elif new_file.endswith(".osl"): # open shading language
pass
else: else:
raise Exception("unknown file type - not c or h %s -> %s" % (f, new_file)) raise Exception("unknown file type - not c or h %s -> %s" % (f, new_file))

9
intern/cycles/CMakeLists.txt
View File

@@ -1,6 +1,6 @@
set(CYCLES_INSTALL_PATH "scripts/addons/cycles") set(CYCLES_INSTALL_PATH "scripts/addons/cycles")
SET(WITH_CYCLES_BLENDER ON) set(WITH_CYCLES_BLENDER ON)
# External Libraries # External Libraries
@@ -14,7 +14,7 @@ set(GCC_OPTIM_FLAGS "-ffast-math -msse -msse2 -msse3 -mtune=native")
if(APPLE) if(APPLE)
set(CMAKE_CXX_FLAGS "${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") set(RTTI_DISABLE_FLAGS "-fno-rtti -DBOOST_NO_RTTI -DBOOST_NO_TYPEID")
endif(APPLE) endif()
if(WIN32) if(WIN32)
if(MSVC) if(MSVC)
@@ -24,12 +24,12 @@ if(WIN32)
set(CMAKE_CXX_FLAGS "${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") set(RTTI_DISABLE_FLAGS "-fno-rtti -DBOOST_NO_RTTI -DBOOST_NO_TYPEID")
endif() endif()
endif(WIN32) endif()
if(UNIX AND NOT APPLE) 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_WARNING_FLAGS} ${GCC_OPTIM_FLAGS}")
set(RTTI_DISABLE_FLAGS "-fno-rtti -DBOOST_NO_RTTI -DBOOST_NO_TYPEID") set(RTTI_DISABLE_FLAGS "-fno-rtti -DBOOST_NO_RTTI -DBOOST_NO_TYPEID")
endif(UNIX AND NOT APPLE) endif()
# Definitions and Includes # Definitions and Includes
@@ -73,4 +73,3 @@ add_subdirectory(kernel)
add_subdirectory(render) add_subdirectory(render)
add_subdirectory(subd) add_subdirectory(subd)
add_subdirectory(util) add_subdirectory(util)

24
intern/cycles/app/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
include_directories( set(INC
. .
../device ../device
../kernel ../kernel
@@ -7,7 +7,8 @@ include_directories(
../bvh ../bvh
../util ../util
../render ../render
../subd) ../subd
)
set(LIBRARIES set(LIBRARIES
cycles_device cycles_device
@@ -19,7 +20,8 @@ set(LIBRARIES
${BOOST_LIBRARIES} ${BOOST_LIBRARIES}
${OPENGL_LIBRARIES} ${OPENGL_LIBRARIES}
${CYCLES_GLEW_LIBRARY} ${CYCLES_GLEW_LIBRARY}
${OPENIMAGEIO_LIBRARIES}) ${OPENIMAGEIO_LIBRARIES}
)
link_directories(${OPENIMAGEIO_LIBPATH} ${BOOST_LIBPATH}) link_directories(${OPENIMAGEIO_LIBPATH} ${BOOST_LIBPATH})
@@ -35,21 +37,33 @@ if(WITH_CYCLES_PARTIO)
list(APPEND LIBRARIES ${PARTIO_LIBRARIES}) list(APPEND LIBRARIES ${PARTIO_LIBRARIES})
endif() endif()
include_directories(${INC})
if(WITH_CYCLES_TEST) if(WITH_CYCLES_TEST)
add_executable(cycles_test cycles_test.cpp cycles_xml.cpp cycles_xml.h) set(SRC
cycles_test.cpp
cycles_xml.cpp
cycles_xml.h
)
add_executable(cycles_test ${SRC})
target_link_libraries(cycles_test ${LIBRARIES}) target_link_libraries(cycles_test ${LIBRARIES})
if(UNIX AND NOT APPLE) if(UNIX AND NOT APPLE)
set_target_properties(cycles_test PROPERTIES INSTALL_RPATH $ORIGIN/lib) set_target_properties(cycles_test PROPERTIES INSTALL_RPATH $ORIGIN/lib)
endif() endif()
unset(SRC)
endif() endif()
if(WITH_CYCLES_NETWORK) if(WITH_CYCLES_NETWORK)
add_executable(cycles_server cycles_server.cpp) set(SRC
cycles_server.cpp
)
add_executable(cycles_server ${SRC})
target_link_libraries(cycles_server ${LIBRARIES}) target_link_libraries(cycles_server ${LIBRARIES})
if(UNIX AND NOT APPLE) if(UNIX AND NOT APPLE)
set_target_properties(cycles_server PROPERTIES INSTALL_RPATH $ORIGIN/lib) set_target_properties(cycles_server PROPERTIES INSTALL_RPATH $ORIGIN/lib)
endif() endif()
unset(SRC)
endif() endif()

40
intern/cycles/blender/CMakeLists.txt
View File

@@ -1,5 +1,21 @@
set(sources set(INC
../render
../device
../kernel
../kernel/svm
../util
../subd
)
set(INC_SYS
${BLENDER_INCLUDE_DIRS}
${PYTHON_INCLUDE_DIRS}
${GLEW_INCLUDE_PATH}
)
set(SRC
blender_camera.cpp blender_camera.cpp
blender_mesh.cpp blender_mesh.cpp
blender_object.cpp blender_object.cpp
@@ -10,30 +26,22 @@ set(sources
blender_sync.h blender_sync.h
blender_session.h blender_session.h
blender_util.h) blender_util.h
)
set(addonfiles set(ADDON_FILES
addon/__init__.py addon/__init__.py
addon/engine.py addon/engine.py
addon/enums.py addon/enums.py
addon/presets.py addon/presets.py
addon/properties.py addon/properties.py
addon/ui.py addon/ui.py
addon/xml.py) addon/xml.py
)
include_directories( blender_add_lib(bf_intern_cycles "${SRC}" "${INC}" "${INC_SYS}")
../render
../device
../kernel
../kernel/svm
../util
../subd
${BLENDER_INCLUDE_DIRS}
${PYTHON_INCLUDE_DIRS}
${GLEW_INCLUDE_PATH})
blender_add_lib(bf_intern_cycles "${sources}" "" "")
add_dependencies(bf_intern_cycles bf_rna) add_dependencies(bf_intern_cycles bf_rna)
delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${addonfiles}" ${CYCLES_INSTALL_PATH}) delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${ADDON_FILES}" ${CYCLES_INSTALL_PATH})

22
intern/cycles/bvh/CMakeLists.txt
View File

@@ -1,18 +1,28 @@
include_directories(. ../kernel ../kernel/svm ../render ../util ../device) set(INC
.
../kernel
../kernel/svm
../render
../util
../device
)
set(sources set(SRC
bvh.cpp bvh.cpp
bvh_build.cpp bvh_build.cpp
bvh_node.cpp bvh_node.cpp
bvh_sort.cpp) bvh_sort.cpp
)
set(headers set(SRC_HEADERS
bvh.h bvh.h
bvh_build.h bvh_build.h
bvh_node.h bvh_node.h
bvh_params.h bvh_params.h
bvh_sort.h) bvh_sort.h
)
add_library(cycles_bvh ${sources} ${headers}) include_directories(${INC})
add_library(cycles_bvh ${SRC} ${SRC_HEADERS})

19
intern/cycles/device/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
include_directories( set(INC
. .
../kernel ../kernel
../kernel/svm ../kernel/svm
@@ -7,21 +7,26 @@ include_directories(
../util ../util
../render ../render
${OPENGL_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR}
${GLEW_INCLUDE_PATH}) ${GLEW_INCLUDE_PATH}
)
set(sources set(SRC
device.cpp device.cpp
device_cpu.cpp device_cpu.cpp
device_cuda.cpp device_cuda.cpp
device_multi.cpp device_multi.cpp
device_network.cpp device_network.cpp
device_opencl.cpp) device_opencl.cpp
)
set(headers set(SRC_HEADERS
device.h device.h
device_intern.h device_intern.h
device_network.h) device_network.h
)
add_definitions(-DGLEW_STATIC) add_definitions(-DGLEW_STATIC)
add_library(cycles_device ${sources} ${headers})
include_directories(${INC})
add_library(cycles_device ${SRC} ${SRC_HEADERS})

1
intern/cycles/doc/CMakeLists.txt
View File

@@ -1,3 +1,2 @@
add_subdirectory(license) add_subdirectory(license)

8
intern/cycles/doc/license/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
set(licenses set(LICENSES
Apache_2.0.txt Apache_2.0.txt
Blender.txt Blender.txt
GPL.txt GPL.txt
@@ -7,7 +7,7 @@ set(licenses
NVidia.txt NVidia.txt
OSL.txt OSL.txt
Sobol.txt Sobol.txt
readme.txt) readme.txt
)
delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${licenses}" ${CYCLES_INSTALL_PATH}/license)
delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${LICENSES}" ${CYCLES_INSTALL_PATH}/license)

49
intern/cycles/kernel/CMakeLists.txt
View File

@@ -1,10 +1,18 @@
set(sources set(INC
.
../util
osl
svm
)
set(SRC
kernel.cpp kernel.cpp
kernel.cl kernel.cl
kernel.cu) kernel.cu
)
set(headers set(SRC_HEADERS
kernel.h kernel.h
kernel_bvh.h kernel_bvh.h
kernel_camera.h kernel_camera.h
@@ -27,9 +35,10 @@ set(headers
kernel_shader.h kernel_shader.h
kernel_textures.h kernel_textures.h
kernel_triangle.h kernel_triangle.h
kernel_types.h) kernel_types.h
)
set(svm_headers set(SRC_SVM_HEADERS
svm/bsdf.h svm/bsdf.h
svm/bsdf_ashikhmin_velvet.h svm/bsdf_ashikhmin_velvet.h
svm/bsdf_diffuse.h svm/bsdf_diffuse.h
@@ -66,13 +75,14 @@ set(svm_headers
svm/svm_voronoi.h svm/svm_voronoi.h
svm/svm_wave.h svm/svm_wave.h
svm/volume.h svm/volume.h
) )
set(util_headers set(SRC_UTIL_HEADERS
../util/util_color.h ../util/util_color.h
../util/util_math.h ../util/util_math.h
../util/util_transform.h ../util/util_transform.h
../util/util_types.h) ../util/util_types.h
)
# OSL module # OSL module
@@ -82,9 +92,9 @@ endif()
# CPU module # CPU module
include_directories(. ../util osl svm) include_directories(${INC})
add_library(cycles_kernel ${sources} ${headers} ${svm_headers}) add_library(cycles_kernel ${SRC} ${SRC_HEADERS} ${SRC_SVM_HEADERS})
if(WITH_CYCLES_CUDA) if(WITH_CYCLES_CUDA)
add_dependencies(cycles_kernel cycles_kernel_cuda) add_dependencies(cycles_kernel cycles_kernel_cuda)
@@ -92,17 +102,16 @@ endif()
# OPENCL kernel # OPENCL kernel
#set(kernel_preprocessed ${CMAKE_CURRENT_BINARY_DIR}/kernel_preprocessed.cl) #set(KERNEL_PREPROCESSED ${CMAKE_CURRENT_BINARY_DIR}/kernel_preprocessed.cl)
#add_custom_command( #add_custom_command(
# OUTPUT ${kernel_preprocessed} # OUTPUT ${KERNEL_PREPROCESSED}
# COMMAND gcc -x c++ -E ${CMAKE_CURRENT_SOURCE_DIR}/kernel.cl -I ${CMAKE_CURRENT_SOURCE_DIR}/../util/ -DCCL_NAMESPACE_BEGIN= -DCCL_NAMESPACE_END= -DWITH_OPENCL -o ${kernel_preprocessed} # COMMAND gcc -x c++ -E ${CMAKE_CURRENT_SOURCE_DIR}/kernel.cl -I ${CMAKE_CURRENT_SOURCE_DIR}/../util/ -DCCL_NAMESPACE_BEGIN= -DCCL_NAMESPACE_END= -DWITH_OPENCL -o ${KERNEL_PREPROCESSED}
# DEPENDS ${kernel_sources} ${util_headers}) # DEPENDS ${SRC_KERNEL} ${SRC_UTIL_HEADERS})
#add_custom_target(cycles_kernel_preprocess ALL DEPENDS ${kernel_preprocessed}) #add_custom_target(cycles_kernel_preprocess ALL DEPENDS ${KERNEL_PREPROCESSED})
#delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${kernel_preprocessed}" ${CYCLES_INSTALL_PATH}/kernel) #delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${KERNEL_PREPROCESSED}" ${CYCLES_INSTALL_PATH}/kernel)
delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernel.cl" ${CYCLES_INSTALL_PATH}/kernel) delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernel.cl" ${CYCLES_INSTALL_PATH}/kernel)
delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernel.cu" ${CYCLES_INSTALL_PATH}/kernel) delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernel.cu" ${CYCLES_INSTALL_PATH}/kernel)
delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${headers}" ${CYCLES_INSTALL_PATH}/kernel) delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${SRC_HEADERS}" ${CYCLES_INSTALL_PATH}/kernel)
delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${svm_headers}" ${CYCLES_INSTALL_PATH}/kernel/svm) delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${SRC_SVM_HEADERS}" ${CYCLES_INSTALL_PATH}/kernel/svm)
delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${util_headers}" ${CYCLES_INSTALL_PATH}/kernel) delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${SRC_UTIL_HEADERS}" ${CYCLES_INSTALL_PATH}/kernel)

24
intern/cycles/kernel/osl/CMakeLists.txt
View File

@@ -1,7 +1,14 @@
include_directories(. ../ ../svm ../../render ../../util ../../device) set(INC
.
../
../svm
../../render
../../util
../../device
)
set(sources set(SRC
background.cpp background.cpp
bsdf_ashikhmin_velvet.cpp bsdf_ashikhmin_velvet.cpp
bsdf_diffuse.cpp bsdf_diffuse.cpp
@@ -17,17 +24,20 @@ set(sources
osl_closures.cpp osl_closures.cpp
osl_services.cpp osl_services.cpp
osl_shader.cpp osl_shader.cpp
vol_subsurface.cpp) vol_subsurface.cpp
)
set(headers set(HEADER_SRC
osl_closures.h osl_closures.h
osl_globals.h osl_globals.h
osl_services.h osl_services.h
osl_shader.h) osl_shader.h
)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${RTTI_DISABLE_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${RTTI_DISABLE_FLAGS}")
add_library(cycles_kernel_osl ${sources} ${headers}) include_directories(${INC})
add_library(cycles_kernel_osl ${SRC} ${HEADER_SRC})
add_subdirectory(nodes) add_subdirectory(nodes)

41
intern/cycles/kernel/osl/nodes/CMakeLists.txt
View File

@@ -1,7 +1,7 @@
# OSL node shaders # OSL node shaders
set(osl_sources set(SRC_OSL
node_add_closure.osl node_add_closure.osl
node_attribute.osl node_attribute.osl
node_background.osl node_background.osl
@@ -45,26 +45,35 @@ set(osl_sources
node_velvet_bsdf.osl node_velvet_bsdf.osl
node_voronoi_texture.osl node_voronoi_texture.osl
node_ward_bsdf.osl node_ward_bsdf.osl
node_wood_texture.osl) node_wood_texture.osl
)
set(osl_headers set(SRC_OSL_HEADERS
node_texture.h node_texture.h
stdosl.h) stdosl.h
)
set(oso_sources) set(SRC_OSO
foreach(_file ${osl_sources}) )
set(osl_file ${CMAKE_CURRENT_SOURCE_DIR}/${_file})
string(REPLACE ".osl" ".oso" oso_file ${osl_file}) # TODO, add a module to compile OSL
string(REPLACE ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} oso_file ${oso_file}) foreach(_file ${SRC_OSL})
set(_OSL_FILE ${CMAKE_CURRENT_SOURCE_DIR}/${_file})
string(REPLACE ".osl" ".oso" _OSO_FILE ${_OSL_FILE}) # TODO, replace extension only
string(REPLACE ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} _OSO_FILE ${_OSO_FILE})
add_custom_command( add_custom_command(
OUTPUT ${oso_file} OUTPUT ${_OSO_FILE}
COMMAND ${OSL_COMPILER} -O2 ${osl_file} COMMAND ${OSL_COMPILER} -O2 ${_OSL_FILE}
DEPENDS ${osl_file} ${osl_headers}) DEPENDS ${_OSL_FILE} ${SRC_OSL_HEADERS})
list(APPEND oso_sources ${oso_file}) list(APPEND SRC_OSO
${_OSO_FILE}
)
unset(_OSL_FILE)
unset(_OSO_FILE)
endforeach() endforeach()
add_custom_target(shader ALL DEPENDS ${oso_sources} ${osl_headers}) add_custom_target(shader ALL DEPENDS ${SRC_OSO} ${SRC_OSL_HEADERS})
delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${oso_sources}" ${CYCLES_INSTALL_PATH}/shader)
delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${SRC_OSO}" ${CYCLES_INSTALL_PATH}/shader)

19
intern/cycles/render/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
include_directories( set(INC
. .
../device ../device
../kernel ../kernel
@@ -7,9 +7,10 @@ include_directories(
../kernel/osl ../kernel/osl
../bvh ../bvh
../util ../util
${GLEW_INCLUDE_PATH}) ${GLEW_INCLUDE_PATH}
)
set(sources set(SRC
attribute.cpp attribute.cpp
background.cpp background.cpp
buffers.cpp buffers.cpp
@@ -30,9 +31,10 @@ set(sources
shader.cpp shader.cpp
sobol.cpp sobol.cpp
svm.cpp svm.cpp
tile.cpp) tile.cpp
)
set(headers set(SRC_HEADERS
attribute.h attribute.h
background.h background.h
buffers.h buffers.h
@@ -52,9 +54,12 @@ set(headers
shader.h shader.h
sobol.h sobol.h
svm.h svm.h
tile.h) tile.h
)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${RTTI_DISABLE_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${RTTI_DISABLE_FLAGS}")
add_library(cycles_render ${sources} ${headers}) include_directories(${INC})
add_library(cycles_render ${SRC} ${SRC_HEADERS})

21
intern/cycles/subd/CMakeLists.txt
View File

@@ -1,16 +1,23 @@
include_directories(. ../util ../kernel ../kernel/svm ../render) set(INC
.
../util
../kernel
../kernel/svm
../render
)
set(sources set(SRC
subd_build.cpp subd_build.cpp
subd_dice.cpp subd_dice.cpp
subd_mesh.cpp subd_mesh.cpp
subd_patch.cpp subd_patch.cpp
subd_ring.cpp subd_ring.cpp
subd_split.cpp subd_split.cpp
subd_stencil.cpp) subd_stencil.cpp
)
set(headers set(SRC_HEADERS
subd_build.h subd_build.h
subd_dice.h subd_dice.h
subd_edge.h subd_edge.h
@@ -20,7 +27,9 @@ set(headers
subd_ring.h subd_ring.h
subd_split.h subd_split.h
subd_stencil.h subd_stencil.h
subd_vert.h) subd_vert.h
)
add_library(cycles_subd ${sources} ${headers}) include_directories(${INC})
add_library(cycles_subd ${SRC} ${SRC_HEADERS})

22
intern/cycles/util/CMakeLists.txt
View File

@@ -1,10 +1,11 @@
include_directories( set(INC
. .
${GLEW_INCLUDE_PATH} ${GLEW_INCLUDE_PATH}
${OPENGL_INCLUDE_DIR}) ${OPENGL_INCLUDE_DIR}
)
set(sources set(SRC
util_cache.cpp util_cache.cpp
util_cuda.cpp util_cuda.cpp
util_dynlib.cpp util_dynlib.cpp
@@ -15,13 +16,16 @@ set(sources
util_string.cpp util_string.cpp
util_system.cpp util_system.cpp
util_time.cpp util_time.cpp
util_transform.cpp) util_transform.cpp
)
if(WITH_CYCLES_TEST) if(WITH_CYCLES_TEST)
list(APPEND sources util_view.cpp) list(APPEND SRC
util_view.cpp
)
endif() endif()
set(headers set(SRC_HEADERS
util_algorithm.h util_algorithm.h
util_args.h util_args.h
util_boundbox.h util_boundbox.h
@@ -51,7 +55,9 @@ set(headers
util_types.h util_types.h
util_view.h util_view.h
util_vector.h util_vector.h
util_xml.h) util_xml.h
)
add_library(cycles_util ${sources} ${headers}) include_directories(${INC})
add_library(cycles_util ${SRC} ${SRC_HEADERS})