Skip to content

Commit 57b8da9

Browse files
authored
Merge pull request #1431 from est77/est_release_work
1.7 release work
2 parents f977ba6 + 2f81827 commit 57b8da9

File tree

78 files changed

+477
-5494
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+477
-5494
lines changed

CMakeLists.txt

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@ option (WITH_STUDIO "Build appleseed.studio"
108108
option (WITH_TOOLS "Build appleseed tools" ON)
109109
option (WITH_PYTHON "Build Python bindings" ON)
110110
option (WITH_DISNEY_MATERIAL "Build Disney material" OFF)
111-
option (WITH_PARTIO "Build Partio support (used in unit tests)" OFF)
112111

113112
option (USE_CPP11 "Use C++11" OFF)
114113
option (USE_STATIC_BOOST "Use static Boost libraries" ON)
@@ -255,11 +254,6 @@ if (WITH_DISNEY_MATERIAL)
255254
endif ()
256255
endif ()
257256

258-
if (WITH_PARTIO)
259-
add_definitions (-DAPPLESEED_WITH_PARTIO)
260-
find_package (Partio REQUIRED)
261-
endif ()
262-
263257

264258
#--------------------------------------------------------------------------------------------------
265259
# Include paths.
@@ -329,10 +323,6 @@ if (WITH_DISNEY_MATERIAL)
329323
endif ()
330324
endif ()
331325

332-
if (WITH_PARTIO)
333-
include_directories (${PARTIO_INCLUDE_DIRS})
334-
endif ()
335-
336326

337327
#--------------------------------------------------------------------------------------------------
338328
# Preprocessor definitions.
-283 Bytes
Loading
-200 Bytes
Loading
-201 Bytes
Loading
-7 Bytes
Loading
185 Bytes
Loading
242 Bytes
Loading
-889 Bytes
Loading
-1.73 KB
Loading
1.57 KB
Loading

0 commit comments

Comments
 (0)