Revision: 41681
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41681
Author: campbellbarton
Date: 2011-11-08 20:27:37 +0000 (Tue, 08 Nov 2011)
Log Message:
-----------
edits to cycles cmake files so cmake_consistency_check.py can parse them.
Modified Paths:
--------------
trunk/blender/build_files/cmake/cmake_consistency_check.py
trunk/blender/intern/cycles/CMakeLists.txt
trunk/blender/intern/cycles/app/CMakeLists.txt
trunk/blender/intern/cycles/blender/CMakeLists.txt
trunk/blender/intern/cycles/bvh/CMakeLists.txt
trunk/blender/intern/cycles/device/CMakeLists.txt
trunk/blender/intern/cycles/doc/CMakeLists.txt
trunk/blender/intern/cycles/doc/license/CMakeLists.txt
trunk/blender/intern/cycles/kernel/CMakeLists.txt
trunk/blender/intern/cycles/kernel/osl/CMakeLists.txt
trunk/blender/intern/cycles/kernel/osl/nodes/CMakeLists.txt
trunk/blender/intern/cycles/render/CMakeLists.txt
trunk/blender/intern/cycles/subd/CMakeLists.txt
trunk/blender/intern/cycles/util/CMakeLists.txt
Modified: trunk/blender/build_files/cmake/cmake_consistency_check.py
===================================================================
--- trunk/blender/build_files/cmake/cmake_consistency_check.py 2011-11-08
20:06:14 UTC (rev 41680)
+++ trunk/blender/build_files/cmake/cmake_consistency_check.py 2011-11-08
20:27:37 UTC (rev 41681)
@@ -172,6 +172,12 @@
pass
elif new_file.endswith(".def"):
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:
raise Exception("unknown file type - not c or
h %s -> %s" % (f, new_file))
Modified: trunk/blender/intern/cycles/CMakeLists.txt
===================================================================
--- trunk/blender/intern/cycles/CMakeLists.txt 2011-11-08 20:06:14 UTC (rev
41680)
+++ trunk/blender/intern/cycles/CMakeLists.txt 2011-11-08 20:27:37 UTC (rev
41681)
@@ -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 @@
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 @@
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(render)
add_subdirectory(subd)
add_subdirectory(util)
-
Modified: trunk/blender/intern/cycles/app/CMakeLists.txt
===================================================================
--- trunk/blender/intern/cycles/app/CMakeLists.txt 2011-11-08 20:06:14 UTC
(rev 41680)
+++ trunk/blender/intern/cycles/app/CMakeLists.txt 2011-11-08 20:27:37 UTC
(rev 41681)
@@ -1,5 +1,5 @@
-include_directories(
+set(INC
.
../device
../kernel
@@ -7,7 +7,8 @@
../bvh
../util
../render
- ../subd)
+ ../subd
+)
set(LIBRARIES
cycles_device
@@ -19,7 +20,8 @@
${BOOST_LIBRARIES}
${OPENGL_LIBRARIES}
${CYCLES_GLEW_LIBRARY}
- ${OPENIMAGEIO_LIBRARIES})
+ ${OPENIMAGEIO_LIBRARIES}
+)
link_directories(${OPENIMAGEIO_LIBPATH} ${BOOST_LIBPATH})
@@ -35,21 +37,33 @@
list(APPEND LIBRARIES ${PARTIO_LIBRARIES})
endif()
+include_directories(${INC})
+
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})
if(UNIX AND NOT APPLE)
set_target_properties(cycles_test PROPERTIES INSTALL_RPATH
$ORIGIN/lib)
endif()
+ unset(SRC)
endif()
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})
if(UNIX AND NOT APPLE)
set_target_properties(cycles_server PROPERTIES INSTALL_RPATH
$ORIGIN/lib)
endif()
+ unset(SRC)
endif()
Modified: trunk/blender/intern/cycles/blender/CMakeLists.txt
===================================================================
--- trunk/blender/intern/cycles/blender/CMakeLists.txt 2011-11-08 20:06:14 UTC
(rev 41680)
+++ trunk/blender/intern/cycles/blender/CMakeLists.txt 2011-11-08 20:27:37 UTC
(rev 41681)
@@ -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_mesh.cpp
blender_object.cpp
@@ -10,30 +26,22 @@
blender_sync.h
blender_session.h
- blender_util.h)
+ blender_util.h
+)
-set(addonfiles
+set(ADDON_FILES
addon/__init__.py
addon/engine.py
addon/enums.py
addon/presets.py
addon/properties.py
addon/ui.py
- addon/xml.py)
+ addon/xml.py
+)
-include_directories(
- ../render
- ../device
- ../kernel
- ../kernel/svm
- ../util
- ../subd
- ${BLENDER_INCLUDE_DIRS}
- ${PYTHON_INCLUDE_DIRS}
- ${GLEW_INCLUDE_PATH})
+blender_add_lib(bf_intern_cycles "${SRC}" "${INC}" "${INC_SYS}")
-blender_add_lib(bf_intern_cycles "${sources}" "" "")
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})
Modified: trunk/blender/intern/cycles/bvh/CMakeLists.txt
===================================================================
--- trunk/blender/intern/cycles/bvh/CMakeLists.txt 2011-11-08 20:06:14 UTC
(rev 41680)
+++ trunk/blender/intern/cycles/bvh/CMakeLists.txt 2011-11-08 20:27:37 UTC
(rev 41681)
@@ -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_build.cpp
bvh_node.cpp
- bvh_sort.cpp)
+ bvh_sort.cpp
+)
-set(headers
+set(SRC_HEADERS
bvh.h
bvh_build.h
bvh_node.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})
Modified: trunk/blender/intern/cycles/device/CMakeLists.txt
===================================================================
--- trunk/blender/intern/cycles/device/CMakeLists.txt 2011-11-08 20:06:14 UTC
(rev 41680)
+++ trunk/blender/intern/cycles/device/CMakeLists.txt 2011-11-08 20:27:37 UTC
(rev 41681)
@@ -1,5 +1,5 @@
-include_directories(
+set(INC
.
../kernel
../kernel/svm
@@ -7,21 +7,26 @@
../util
../render
${OPENGL_INCLUDE_DIR}
- ${GLEW_INCLUDE_PATH})
+ ${GLEW_INCLUDE_PATH}
+)
-set(sources
+set(SRC
device.cpp
device_cpu.cpp
device_cuda.cpp
device_multi.cpp
device_network.cpp
- device_opencl.cpp)
+ device_opencl.cpp
+)
-set(headers
+set(SRC_HEADERS
device.h
device_intern.h
- device_network.h)
+ device_network.h
+)
add_definitions(-DGLEW_STATIC)
-add_library(cycles_device ${sources} ${headers})
+include_directories(${INC})
+
+add_library(cycles_device ${SRC} ${SRC_HEADERS})
Modified: trunk/blender/intern/cycles/doc/CMakeLists.txt
===================================================================
--- trunk/blender/intern/cycles/doc/CMakeLists.txt 2011-11-08 20:06:14 UTC
(rev 41680)
+++ trunk/blender/intern/cycles/doc/CMakeLists.txt 2011-11-08 20:27:37 UTC
(rev 41681)
@@ -1,3 +1,2 @@
add_subdirectory(license)
-
Modified: trunk/blender/intern/cycles/doc/license/CMakeLists.txt
===================================================================
--- trunk/blender/intern/cycles/doc/license/CMakeLists.txt 2011-11-08
20:06:14 UTC (rev 41680)
+++ trunk/blender/intern/cycles/doc/license/CMakeLists.txt 2011-11-08
20:27:37 UTC (rev 41681)
@@ -1,5 +1,5 @@
-set(licenses
+set(LICENSES
Apache_2.0.txt
Blender.txt
GPL.txt
@@ -7,7 +7,7 @@
NVidia.txt
OSL.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)
Modified: trunk/blender/intern/cycles/kernel/CMakeLists.txt
===================================================================
--- trunk/blender/intern/cycles/kernel/CMakeLists.txt 2011-11-08 20:06:14 UTC
(rev 41680)
+++ trunk/blender/intern/cycles/kernel/CMakeLists.txt 2011-11-08 20:27:37 UTC
(rev 41681)
@@ -1,10 +1,18 @@
-set(sources
+set(INC
+ .
+ ../util
+ osl
+ svm
+)
+
+set(SRC
kernel.cpp
kernel.cl
- kernel.cu)
+ kernel.cu
+)
-set(headers
+set(SRC_HEADERS
kernel.h
kernel_bvh.h
kernel_camera.h
@@ -27,9 +35,10 @@
kernel_shader.h
kernel_textures.h
kernel_triangle.h
- kernel_types.h)
+ kernel_types.h
+)
-set(svm_headers
+set(SRC_SVM_HEADERS
svm/bsdf.h
svm/bsdf_ashikhmin_velvet.h
svm/bsdf_diffuse.h
@@ -66,13 +75,14 @@
svm/svm_voronoi.h
svm/svm_wave.h
svm/volume.h
- )
+)
-set(util_headers
+set(SRC_UTIL_HEADERS
../util/util_color.h
../util/util_math.h
../util/util_transform.h
- ../util/util_types.h)
+ ../util/util_types.h
+)
# OSL module
@@ -82,9 +92,9 @@
# 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)
add_dependencies(cycles_kernel cycles_kernel_cuda)
@@ -92,17 +102,16 @@
# 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(
-# 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}
-# DEPENDS ${kernel_sources} ${util_headers})
-#add_custom_target(cycles_kernel_preprocess ALL DEPENDS ${kernel_preprocessed})
-#delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${kernel_preprocessed}"
${CYCLES_INSTALL_PATH}/kernel)
+# 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}
+# DEPENDS ${SRC_KERNEL} ${SRC_UTIL_HEADERS})
+#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.cl"
${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)
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
