[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52046] trunk/blender/intern/cycles: Cycles / CMake:

[Thomas Dinges]

Revision: 52046
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52046
Author:   dingto
Date:     2012-11-09 18:31:04 +0000 (Fri, 09 Nov 2012)
Log Message:
-----------
Cycles / CMake:
* Removed PARTIO building code, partio code was removed already.
* Include "app" dir only when building with CYCLES_TEST enabled.

Modified Paths:
--------------
    trunk/blender/intern/cycles/CMakeLists.txt
    trunk/blender/intern/cycles/app/CMakeLists.txt
    trunk/blender/intern/cycles/cmake/external_libs.cmake

Modified: trunk/blender/intern/cycles/CMakeLists.txt
===================================================================
--- trunk/blender/intern/cycles/CMakeLists.txt	2012-11-09 17:12:39 UTC (rev 52045)
+++ trunk/blender/intern/cycles/CMakeLists.txt	2012-11-09 18:31:04 UTC (rev 52046)
@@ -44,10 +44,6 @@
 	include_directories(${OSL_INCLUDES})
 endif()
 
-if(WITH_CYCLES_PARTIO)
-	add_definitions(-DWITH_PARTIO)
-endif()
-
 if(WITH_CYCLES_CUDA_BINARIES)
 	add_definitions(-DWITH_CUDA_BINARIES)
 endif()
@@ -69,7 +65,10 @@
 	add_subdirectory(blender)
 endif()
 
-add_subdirectory(app)
+if(WITH_CYCLES_TEST)
+	add_subdirectory(app)
+endif()
+
 add_subdirectory(bvh)
 add_subdirectory(device)
 add_subdirectory(doc)

Modified: trunk/blender/intern/cycles/app/CMakeLists.txt
===================================================================
--- trunk/blender/intern/cycles/app/CMakeLists.txt	2012-11-09 17:12:39 UTC (rev 52045)
+++ trunk/blender/intern/cycles/app/CMakeLists.txt	2012-11-09 18:31:04 UTC (rev 52046)
@@ -35,10 +35,6 @@
 	list(APPEND LIBRARIES cycles_kernel_osl ${OSL_LIBRARIES})
 endif()
 
-if(WITH_CYCLES_PARTIO)
-	list(APPEND LIBRARIES ${PARTIO_LIBRARIES})
-endif()
-
 include_directories(${INC})
 include_directories(SYSTEM ${INC_SYS})
 

Modified: trunk/blender/intern/cycles/cmake/external_libs.cmake
===================================================================
--- trunk/blender/intern/cycles/cmake/external_libs.cmake	2012-11-09 17:12:39 UTC (rev 52045)
+++ trunk/blender/intern/cycles/cmake/external_libs.cmake	2012-11-09 18:31:04 UTC (rev 52046)
@@ -18,33 +18,6 @@
 endif()
 
 ###########################################################################
-# Partio
-
-if(WITH_CYCLES_PARTIO)
-
-	set(CYCLES_PARTIO "" CACHE PATH "Path to Partio installation")
-
-	message(STATUS "CYCLES_PARTIO = ${CYCLES_PARTIO}")
-
-	find_library(PARTIO_LIBRARIES NAMES partio PATHS ${CYCLES_PARTIO}/lib)
-	find_path(PARTIO_INCLUDES Partio.h ${CYCLES_PARTIO}/include)
-
-	find_package(ZLIB)
-
-	if(PARTIO_INCLUDES AND PARTIO_LIBRARIES AND ZLIB_LIBRARIES)
-		list(APPEND PARTIO_LIBRARIES ${ZLIB_LIBRARIES})
-		set(PARTIO_FOUND TRUE)
-		message(STATUS "PARTIO includes = ${PARTIO_INCLUDES}")
-		message(STATUS "PARTIO library = ${PARTIO_LIBRARIES}")
-	else()
-		message(STATUS "PARTIO not found")
-	endif()
-
-	include_directories(${PARTIO_INCLUDES})
-
-endif()
-
-###########################################################################
 # CUDA
 
 if(WITH_CYCLES_CUDA_BINARIES)