diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2016-11-16 19:01:19 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2016-11-16 19:04:21 +0300 |
| commit | 2bcb1b208a4193fb28f1e0c4408b733f5ee2c028 (patch) | |
| tree | 8b9260ffd9fb7b371dc66955903c7b0c7f4e7bf9 /build_files | |
| parent | 930f999f6ea683d02ac490026a52817f1d965377 (diff) | |
| parent | 2a2eb0c463bd96d42f7306eb17f88cad87f73aea (diff) | |
Merge remote-tracking branch 'origin/master' into blender2.8
Diffstat (limited to 'build_files')
| -rwxr-xr-x | build_files/build_environment/install_deps.sh | 3 | ||||
| -rw-r--r-- | build_files/buildbot/slave_compile.py | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index e1f5922272f..347a44d2900 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -1850,6 +1850,9 @@ compile_OSL() { cmake_d="$cmake_d -D OSL_BUILD_PLUGINS=OFF" cmake_d="$cmake_d -D OSL_BUILD_TESTS=OFF" cmake_d="$cmake_d -D USE_SIMD=sse2" + if [ "$USE_CXX11" = true ]; then + cmake_d="$cmake_d -D OSL_BUILD_CPP11=1" + fi #~ cmake_d="$cmake_d -D ILMBASE_VERSION=$ILMBASE_VERSION" diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py index c2bfd882fde..76d538ad578 100644 --- a/build_files/buildbot/slave_compile.py +++ b/build_files/buildbot/slave_compile.py @@ -183,10 +183,8 @@ if 'cmake' in builder: print('Condifuration FAILED!') sys.exit(retcode) - if 'win32' in builder: - command = ['msbuild', 'INSTALL.vcxproj', '/Property:PlatformToolset=v120_xp', '/p:Configuration=Release'] - elif 'win64' in builder: - command = ['msbuild', 'INSTALL.vcxproj', '/p:Configuration=Release'] + if 'win32' in builder or 'win64' in builder: + command = ['cmake', '--build', '.', '--target', target_name, '--config', 'Release'] else: command = target_chroot_prefix + ['make', '-s', '-j2', target_name] |