diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-13 20:30:42 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-13 20:31:12 +0300 |
commit | 6a8d87db1879cc1bf96217987b52a4be2c80864c (patch) | |
tree | 35263e2a5aecab3ba02cc7b1e492b545cad176d7 | |
parent | 1f39b8b22878ce33f953a0ec301db6be0d944b9b (diff) |
Build environment: backport master changes to blender2.7.
We can keep these in sync for now.
-rw-r--r-- | build_files/build_environment/cmake/openal.cmake | 31 | ||||
-rw-r--r-- | build_files/build_environment/cmake/openmp.cmake | 4 | ||||
-rw-r--r-- | build_files/build_environment/cmake/options.cmake | 3 | ||||
-rw-r--r-- | build_files/build_environment/cmake/osl.cmake | 5 |
4 files changed, 12 insertions, 31 deletions
diff --git a/build_files/build_environment/cmake/openal.cmake b/build_files/build_environment/cmake/openal.cmake index 7a693b1fce2..3cd3a0aac72 100644 --- a/build_files/build_environment/cmake/openal.cmake +++ b/build_files/build_environment/cmake/openal.cmake @@ -18,31 +18,18 @@ if(BUILD_MODE STREQUAL Release) set(OPENAL_EXTRA_ARGS - -DALSOFT_UTILS=OFF - -DALSOFT_NO_CONFIG_UTIL=ON - -DALSOFT_EXAMPLES=OFF - -DALSOFT_TESTS=OFF - -DALSOFT_CONFIG=OFF - -DALSOFT_HRTF_DEFS=OFF - -DALSOFT_INSTALL=ON - -DALSOFT_BACKEND_SNDIO=OFF + -DALSOFT_UTILS=Off + -DALSOFT_NO_CONFIG_UTIL=On + -DALSOFT_EXAMPLES=Off + -DALSOFT_TESTS=Off + -DALSOFT_CONFIG=Off + -DALSOFT_HRTF_DEFS=Off + -DALSOFT_INSTALL=On + -DALSOFT_BACKEND_SNDIO=Off ) if(UNIX) - set(OPENAL_EXTRA_ARGS - ${OPENAL_EXTRA_ARGS} - -DLIBTYPE=STATIC - ) - endif() - - if(UNIX AND NOT APPLE) - # Ensure we have backends for playback. - set(OPENAL_EXTRA_ARGS - ${OPENAL_EXTRA_ARGS} - -DALSOFT_REQUIRE_ALSA=ON - -DALSOFT_REQUIRE_OSS=ON - -DALSOFT_REQUIRE_PULSEAUDIO=ON - ) + set(OPENAL_EXTRA_ARGS ${OPENAL_EXTRA_ARGS} -DLIBTYPE=STATIC) endif() ExternalProject_Add(external_openal diff --git a/build_files/build_environment/cmake/openmp.cmake b/build_files/build_environment/cmake/openmp.cmake index d8224020ecf..f9f5a5cfb63 100644 --- a/build_files/build_environment/cmake/openmp.cmake +++ b/build_files/build_environment/cmake/openmp.cmake @@ -23,8 +23,8 @@ ExternalProject_Add(external_openmp URL_HASH MD5=${OPENMP_HASH} PREFIX ${BUILD_DIR}/openmp CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openmp ${DEFAULT_CMAKE_FLAGS} - INSTALL_COMMAND cd ${BUILD_DIR}/openmp/src/external_openmp-build && install_name_tool -id '@executable_path/../Resources/lib/libomp.dylib' runtime/src/libomp.dylib && make install - INSTALL_PATH ${LIBDIR}/openmp + INSTALL_COMMAND cd ${BUILD_DIR}/openmp/src/external_openmp-build && install_name_tool -id @executable_path/../Resources/lib/libomp.dylib runtime/src/libomp.dylib && make install + INSTALL_DIR ${LIBDIR}/openmp ) add_dependencies( diff --git a/build_files/build_environment/cmake/options.cmake b/build_files/build_environment/cmake/options.cmake index 20e9750bed6..ac36c891976 100644 --- a/build_files/build_environment/cmake/options.cmake +++ b/build_files/build_environment/cmake/options.cmake @@ -127,8 +127,7 @@ else() ) set(OSX_ARCHITECTURES x86_64) set(OSX_DEPLOYMENT_TARGET 10.9) - set(OSX_SDK_VERSION 10.13) - set(OSX_SYSROOT ${XCODE_DEV_PATH}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX${OSX_SDK_VERSION}.sdk) + set(OSX_SYSROOT ${XCODE_DEV_PATH}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk) set(PLATFORM_CFLAGS "-isysroot ${OSX_SYSROOT} -mmacosx-version-min=${OSX_DEPLOYMENT_TARGET}") set(PLATFORM_CXXFLAGS "-isysroot ${OSX_SYSROOT} -mmacosx-version-min=${OSX_DEPLOYMENT_TARGET} -std=c++11 -stdlib=libc++") diff --git a/build_files/build_environment/cmake/osl.cmake b/build_files/build_environment/cmake/osl.cmake index b3cf7356926..795892f29e2 100644 --- a/build_files/build_environment/cmake/osl.cmake +++ b/build_files/build_environment/cmake/osl.cmake @@ -81,11 +81,6 @@ if(WIN32) ${OSL_EXTRA_ARGS} -DPUGIXML_HOME=${LIBDIR}/pugixml ) -elseif(UNIX AND NOT APPLE) - set(OSL_EXTRA_ARGS - ${OSL_EXTRA_ARGS} - -DPUGIXML_HOME=${LIBDIR}/pugixml - ) elseif(APPLE) # Make symbol hiding consistent with OIIO which defaults to OFF, # avoids linker warnings on macOS |