SPI only: bump the version of partio we use internally (#1005)

AcademySoftwareFoundation · Apr 25, 2019 · 1a5dc14 · 1a5dc14
1 parent d354337
commit 1a5dc14
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/site/spi/Makefile-bits b/site/spi/Makefile-bits
@@ -87,11 +87,9 @@ ifeq ($(SP_OS), rhel7)
 			  -DTOOLCHAIN_FLAGS="--gcc-toolchain=/usr"
     endif
 
-    PARTIO_HOME := ${SPCOMP2_ROOT}/partio/rhel7-gcc48m64/v2
     MY_CMAKE_FLAGS += \
 	-DOPENEXR_INCLUDE_DIR=/usr/include/OpenEXR2 \
 	-DOPENEXR_LIBRARY_DIR=/usr/lib64/OpenEXR2 \
-	-DPARTIO_HOME="${PARTIO_HOME}" \
 	-DLLVM_STATIC=1 \
         -DLLVM_VERSION=${LLVM_VERSION} \
         -DLLVM_DIRECTORY=${LLVM_DIRECTORY}
@@ -110,6 +108,9 @@ ifeq ($(SP_OS), rhel7)
     MY_CMAKE_FLAGS += \
         -DBoost_LIBRARIES:STRING="/usr/lib64/boost_${BOOSTVERSSP}/lib${BOOSTSPSUFFIX}boost_regex-gcc48-mt${BOOSTVERS_SUFFIX}.so;/usr/lib64/boost_${BOOSTVERSSP}/lib${BOOSTSPSUFFIX}boost_system-gcc48-mt${BOOSTVERS_SUFFIX}.so;/usr/lib64/boost_${BOOSTVERSSP}/lib${BOOSTSPSUFFIX}boost_thread-gcc48-mt${BOOSTVERS_SUFFIX}.so"
 
+    PARTIO_HOME := ${SPCOMP2_ROOT}/partio/rhel7-gcc48m64-boost155/v3
+    MY_CMAKE_FLAGS += -DPARTIO_HOME="${PARTIO_HOME}"
+
     # set up OpenImageIO distribution environment
     ifeq (${OSL_SPCOMP2},1)
         OPENIMAGEIO_ROOT_DIR=$(SPCOMP2_ROOT)/OpenImageIO/$(SPARCH)/v$(OPENIMAGEIO_SPCOMP2_VERSION)