diff options
| author | Arto Kitula <arto.kitula@gmail.com> | 2018-08-13 16:12:30 +0300 |
|---|---|---|
| committer | Arto Kitula <arto.kitula@gmail.com> | 2018-08-13 16:12:30 +0300 |
| commit | 349d67be288c18bfd45d8232e60a303e19cf11fb (patch) | |
| tree | 6acf24c4062724f0825a21cc8d7b47f2c4190130 /build_files/build_environment/cmake/ilmbase.cmake | |
| parent | 798a83e35faefb269654956dc51c8b2e45b1fd66 (diff) | |
build_environment: update ilmbase and openexr to 2.3.0
Diffstat (limited to 'build_files/build_environment/cmake/ilmbase.cmake')
| -rw-r--r-- | build_files/build_environment/cmake/ilmbase.cmake | 16 |
1 files changed, 10 insertions, 6 deletions
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 ) |