From 8c97cdd6a8ca23b219eb2e75607584ae51fd133d Mon Sep 17 00:00:00 2001 From: Ray Molenkamp Date: Mon, 17 Sep 2018 08:13:08 -0600 Subject: build_environment: force a consistent libdir across Linux distributions. on some distributions libs ended up in lib64 confusing the cmake builder. --- build_files/build_environment/cmake/options.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build_files/build_environment') diff --git a/build_files/build_environment/cmake/options.cmake b/build_files/build_environment/cmake/options.cmake index 7bf971208ae..f3125551972 100644 --- a/build_files/build_environment/cmake/options.cmake +++ b/build_files/build_environment/cmake/options.cmake @@ -143,7 +143,7 @@ else() set(PLATFORM_CXXFLAGS "-std=c++11 -fPIC") set(PLATFORM_LDFLAGS) set(PLATFORM_BUILD_TARGET) - set(PLATFORM_CMAKE_FLAGS) + set(PLATFORM_CMAKE_FLAGS -DCMAKE_INSTALL_LIBDIR=lib) endif() if(WITH_OPTIMIZED_DEBUG) -- cgit v1.2.3 From 39c18c54136323fbf56e667fdb1f1345c7d0f89b Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Mon, 17 Sep 2018 19:39:21 +0200 Subject: Install_deps: workaround building bloody broken OpenEXR release. --- build_files/build_environment/install_deps.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'build_files/build_environment') diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index 8c9105225f1..8ac1fd51075 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -748,9 +748,10 @@ OCIO_SOURCE=( "https://github.com/imageworks/OpenColorIO/archive/v$OCIO_VERSION. #~ OCIO_SOURCE_REPO_UID="6de971097c7f552300f669ed69ca0b6cf5a70843" OPENEXR_USE_REPO=false -OPENEXR_SOURCE=( "https://github.com/openexr/openexr/releases/download/v$OPENEXR_VERSION/openexr-$OPENEXR_VERSION.tar.gz" ) +#~ OPENEXR_SOURCE=( "https://github.com/openexr/openexr/releases/download/v$OPENEXR_VERSION/openexr-$OPENEXR_VERSION.tar.gz" ) +OPENEXR_SOURCE_REPO_UID="0ac2ea34c8f3134148a5df4052e40f155b76f6fb" +OPENEXR_SOURCE=( "https://github.com/openexr/openexr/archive/$OPENEXR_SOURCE_REPO_UID.tar.gz" ) #~ OPENEXR_SOURCE_REPO=( "https://github.com/mont29/openexr.git" ) -#~ OPENEXR_SOURCE_REPO_UID="2787aa1cf652d244ed45ae124eb1553f6cff11ee" ILMBASE_SOURCE=( "https://github.com/openexr/openexr/releases/download/v$ILMBASE_VERSION/ilmbase-$ILMBASE_VERSION.tar.gz" ) OIIO_USE_REPO=false -- cgit v1.2.3