Cycles / CMake:
authorThomas Dinges <blender@dingto.org>
Fri, 9 Nov 2012 18:31:04 +0000 (18:31 +0000)
committerThomas Dinges <blender@dingto.org>
Fri, 9 Nov 2012 18:31:04 +0000 (18:31 +0000)
* Removed PARTIO building code, partio code was removed already.
* Include "app" dir only when building with CYCLES_TEST enabled.

intern/cycles/CMakeLists.txt
intern/cycles/app/CMakeLists.txt
intern/cycles/cmake/external_libs.cmake

index 7562ee0a0a51b91ed4bb241ef3c935691be2d48e..7495a98aed1513e3586d684507b6627da1590c78 100644 (file)
@@ -44,10 +44,6 @@ if(WITH_CYCLES_OSL)
        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 @@ if(WITH_CYCLES_BLENDER)
        add_subdirectory(blender)
 endif()
 
-add_subdirectory(app)
+if(WITH_CYCLES_TEST)
+       add_subdirectory(app)
+endif()
+
 add_subdirectory(bvh)
 add_subdirectory(device)
 add_subdirectory(doc)
index 83b3f731ffe8c9ce086da1866ab342f7c2ae5adf..3fb8aaf934fdecb2d0eb4a5441f65ed4b32636a7 100644 (file)
@@ -35,10 +35,6 @@ if(WITH_CYCLES_OSL)
        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})
 
index 332d3d747155c848cf64152ed54e016dc5b29e69..790049898ffd03879c9c877464378e3b0131c52f 100644 (file)
@@ -17,33 +17,6 @@ else()
        set(CYCLES_GLEW_LIBRARY extern_glew)
 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