Build environment: backport master changes to blender2.7.
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Wed, 13 Mar 2019 17:30:42 +0000 (18:30 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Wed, 13 Mar 2019 17:31:12 +0000 (18:31 +0100)
We can keep these in sync for now.

build_files/build_environment/cmake/openal.cmake
build_files/build_environment/cmake/openmp.cmake
build_files/build_environment/cmake/options.cmake
build_files/build_environment/cmake/osl.cmake

index 7a693b1..3cd3a0a 100644 (file)
 
 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
index d822402..f9f5a5c 100644 (file)
@@ -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(
index 20e9750..ac36c89 100644 (file)
@@ -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++")
index b3cf735..795892f 100644 (file)
@@ -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