[Bf-blender-cvs] [349d67be288] master: build_environment: update ilmbase and openexr to 2.3.0
Arto Kitula
noreply at git.blender.org
Mon Aug 13 15:12:34 CEST 2018
Commit: 349d67be288c18bfd45d8232e60a303e19cf11fb
Author: Arto Kitula
Date: Mon Aug 13 16:12:30 2018 +0300
Branches: master
https://developer.blender.org/rB349d67be288c18bfd45d8232e60a303e19cf11fb
build_environment: update ilmbase and openexr to 2.3.0
===================================================================
M build_files/build_environment/cmake/ilmbase.cmake
M build_files/build_environment/cmake/openexr.cmake
M build_files/build_environment/cmake/versions.cmake
D build_files/build_environment/patches/openexr.diff
===================================================================
diff --git a/build_files/build_environment/cmake/ilmbase.cmake b/build_files/build_environment/cmake/ilmbase.cmake
index 0639848346f..4bc94aacdd7 100644
--- a/build_files/build_environment/cmake/ilmbase.cmake
+++ b/build_files/build_environment/cmake/ilmbase.cmake
@@ -16,13 +16,15 @@
#
# ***** END GPL LICENSE BLOCK *****
-if(WIN32)
- set(ILMBASE_CMAKE_CXX_STANDARD_LIBRARIES "kernel32${LIBEXT} user32${LIBEXT} gdi32${LIBEXT} winspool${LIBEXT} shell32${LIBEXT} ole32${LIBEXT} oleaut32${LIBEXT} uuid${LIBEXT} comdlg32${LIBEXT} advapi32${LIBEXT} psapi${LIBEXT}")
-endif()
+# commenting out, Ray will clean if needed.
+# if(WIN32)
+# set(ILMBASE_CMAKE_CXX_STANDARD_LIBRARIES "kernel32${LIBEXT} user32${LIBEXT} gdi32${LIBEXT} winspool${LIBEXT} shell32${LIBEXT} ole32${LIBEXT} oleaut32${LIBEXT} uuid${LIBEXT} comdlg32${LIBEXT} advapi32${LIBEXT} psapi${LIBEXT}")
+# endif()
set(ILMBASE_EXTRA_ARGS
- -DBUILD_SHARED_LIBS=OFF
- -DCMAKE_CXX_STANDARD_LIBRARIES=${ILMBASE_CMAKE_CXX_STANDARD_LIBRARIES}
+ --enable-static
+ --disable-shared
+ --enable-cxxstd=11
)
ExternalProject_Add(external_ilmbase
@@ -30,6 +32,8 @@ ExternalProject_Add(external_ilmbase
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH MD5=${ILMBASE_HASH}
PREFIX ${BUILD_DIR}/ilmbase
- CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/ilmbase ${DEFAULT_CMAKE_FLAGS} ${ILMBASE_EXTRA_ARGS}
+ CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ilmbase/src/external_ilmbase/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/ilmbase ${ILMBASE_EXTRA_ARGS}
+ BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ilmbase/src/external_ilmbase/ && make -j${MAKE_THREADS}
+ INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ilmbase/src/external_ilmbase/ && make install
INSTALL_DIR ${LIBDIR}/openexr
)
diff --git a/build_files/build_environment/cmake/openexr.cmake b/build_files/build_environment/cmake/openexr.cmake
index 36283951750..509ffa140c7 100644
--- a/build_files/build_environment/cmake/openexr.cmake
+++ b/build_files/build_environment/cmake/openexr.cmake
@@ -16,25 +16,27 @@
#
# ***** END GPL LICENSE BLOCK *****
-if(WIN32)
- set(OPENEXR_CMAKE_CXX_STANDARD_LIBRARIES "kernel32${LIBEXT} user32${LIBEXT} gdi32${LIBEXT} winspool${LIBEXT} shell32${LIBEXT} ole32${LIBEXT} oleaut32${LIBEXT} uuid${LIBEXT} comdlg32${LIBEXT} advapi32${LIBEXT} psapi${LIBEXT}")
-endif()
+# commenting out, Ray will clean if needed.
+# if(WIN32)
+# set(OPENEXR_CMAKE_CXX_STANDARD_LIBRARIES "kernel32${LIBEXT} user32${LIBEXT} gdi32${LIBEXT} winspool${LIBEXT} shell32${LIBEXT} ole32${LIBEXT} oleaut32${LIBEXT} uuid${LIBEXT} comdlg32${LIBEXT} advapi32${LIBEXT} psapi${LIBEXT}")
+# endif()
+set(OPENEXR_PKG_CONFIG_PATH ${LIBDIR}/zlib/share/pkgconfig)
set(OPENEXR_EXTRA_ARGS
- -DBUILD_SHARED_LIBS=OFF
- -DCMAKE_CXX_STANDARD_LIBRARIES=${OPENEXR_CMAKE_CXX_STANDARD_LIBRARIES}
- -DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
- -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
- -DILMBASE_PACKAGE_PREFIX=${LIBDIR}/ilmbase
-)
+ --enable-static
+ --disable-shared
+ --enable-cxxstd=11
+ --with-ilmbase-prefix=${LIBDIR}/ilmbase
+ )
ExternalProject_Add(external_openexr
URL ${OPENEXR_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH MD5=${OPENEXR_HASH}
PREFIX ${BUILD_DIR}/openexr
- PATCH_COMMAND ${PATCH_CMD} -p 0 -d ${BUILD_DIR}/openexr/src/external_openexr < ${PATCH_DIR}/openexr.diff
- CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openexr ${DEFAULT_CMAKE_FLAGS} ${OPENEXR_EXTRA_ARGS}
+ CONFIGURE_COMMAND ${CONFIGURE_ENV} && export PKG_CONFIG_PATH=${OPENEXR_PKG_CONFIG_PATH} && cd ${BUILD_DIR}/openexr/src/external_openexr/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/openexr ${OPENEXR_EXTRA_ARGS}
+ BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/openexr/src/external_openexr/ && make -j${MAKE_THREADS}
+ INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/openexr/src/external_openexr/ && make install
INSTALL_DIR ${LIBDIR}/openexr
)
diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake
index 27cd1d200e0..03164bb1f10 100644
--- a/build_files/build_environment/cmake/versions.cmake
+++ b/build_files/build_environment/cmake/versions.cmake
@@ -45,13 +45,13 @@ set(PTHREADS_VERSION 2-9-1)
set(PTHREADS_URI ftp://sourceware.org/pub/pthreads-win32/pthreads-w32-${PTHREADS_VERSION}-release.tar.gz)
set(PTHREADS_SHA512 9c06e85310766834370c3dceb83faafd397da18a32411ca7645c8eb6b9495fea54ca2872f4a3e8d83cb5fdc5dea7f3f0464be5bb9af3222a6534574a184bd551)
-set(ILMBASE_VERSION 2.2.1)
-set(ILMBASE_URI http://download.savannah.nongnu.org/releases/openexr/ilmbase-${ILMBASE_VERSION}.tar.gz)
-set(ILMBASE_HASH 7b86128b04f0541b6bb33633e299cb44)
+set(ILMBASE_VERSION 2.3.0)
+set(ILMBASE_URI https://github.com/openexr/openexr/releases/download/v${ILMBASE_VERSION}/ilmbase-${ILMBASE_VERSION}.tar.gz)
+set(ILMBASE_HASH 354bf86de3b930ab87ac63619d60c860)
-set(OPENEXR_VERSION 2.2.1)
-set(OPENEXR_URI http://download.savannah.nongnu.org/releases/openexr/openexr-${OPENEXR_VERSION}.tar.gz)
-set(OPENEXR_HASH 421815c32989e1b98fc4798ee754c433)
+set(OPENEXR_VERSION 2.3.0)
+set(OPENEXR_URI https://github.com/openexr/openexr/releases/download/v${OPENEXR_VERSION}/openexr-${OPENEXR_VERSION}.tar.gz)
+set(OPENEXR_HASH a157e8a46596bc185f2472a5a4682174)
set(FREETYPE_VERSION 2.9.1)
set(FREETYPE_URI http://download.savannah.gnu.org/releases/freetype/freetype-${FREETYPE_VERSION}.tar.gz)
diff --git a/build_files/build_environment/patches/openexr.diff b/build_files/build_environment/patches/openexr.diff
deleted file mode 100644
index ec18751fe74..00000000000
--- a/build_files/build_environment/patches/openexr.diff
+++ /dev/null
@@ -1,33 +0,0 @@
---- IlmImf/CMakeLists.txt 2014-08-10 06:23:56.000000000 +0200
-+++ IlmImf/CMakeLists.txt 2017-01-08 04:06:04.931723800 +0100
-@@ -8,8 +8,8 @@
-
- TARGET_LINK_LIBRARIES ( b44ExpLogTable
- Half
-- Iex${ILMBASE_LIBSUFFIX}
- IlmThread${ILMBASE_LIBSUFFIX}
-+ Iex${ILMBASE_LIBSUFFIX}
- ${PTHREAD_LIB}
- )
-
-@@ -25,8 +25,8 @@
-
- TARGET_LINK_LIBRARIES ( dwaLookups
- Half
-- Iex${ILMBASE_LIBSUFFIX}
- IlmThread${ILMBASE_LIBSUFFIX}
-+ Iex${ILMBASE_LIBSUFFIX}
- ${PTHREAD_LIB}
- )
-
-@@ -138,9 +138,9 @@
-
- TARGET_LINK_LIBRARIES ( IlmImf
- Half
-- Iex${ILMBASE_LIBSUFFIX}
- Imath${ILMBASE_LIBSUFFIX}
- IlmThread${ILMBASE_LIBSUFFIX}
-+ Iex${ILMBASE_LIBSUFFIX}
- ${PTHREAD_LIB} ${ZLIB_LIBRARIES}
- )
-
More information about the Bf-blender-cvs
mailing list