diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2015-10-03 17:20:03 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2015-10-03 17:28:09 +0300 |
| commit | 5443d418821a5f87f3f7bff2c04d2918d6c94374 (patch) | |
| tree | 2663fcec1167306c908debb67c868c4d5399013e /build_files/build_environment/install_deps_patches | |
| parent | d9d3a2a5009c76f68fd2e6456db7dac61c4d2e49 (diff) | |
InstallDeps: Fix broken OSL (would not generate valid default names for its .oso pre-compiled files).
Also, externalize temp/hacky patches in own dir, much much cleaner than integrating them in bash script!
Diffstat (limited to 'build_files/build_environment/install_deps_patches')
| -rw-r--r-- | build_files/build_environment/install_deps_patches/llvm.patch | 12 | ||||
| -rw-r--r-- | build_files/build_environment/install_deps_patches/osl.patch | 12 |
2 files changed, 24 insertions, 0 deletions
diff --git a/build_files/build_environment/install_deps_patches/llvm.patch b/build_files/build_environment/install_deps_patches/llvm.patch new file mode 100644 index 00000000000..2e05c334569 --- /dev/null +++ b/build_files/build_environment/install_deps_patches/llvm.patch @@ -0,0 +1,12 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -13,7 +13,7 @@ + set(LLVM_VERSION_MAJOR 3) + set(LLVM_VERSION_MINOR 1) + +-set(PACKAGE_VERSION "\${LLVM_VERSION_MAJOR}.\${LLVM_VERSION_MINOR}svn") ++set(PACKAGE_VERSION "\${LLVM_VERSION_MAJOR}.\${LLVM_VERSION_MINOR}") + + set_property(GLOBAL PROPERTY USE_FOLDERS ON) + + diff --git a/build_files/build_environment/install_deps_patches/osl.patch b/build_files/build_environment/install_deps_patches/osl.patch new file mode 100644 index 00000000000..3b52403f740 --- /dev/null +++ b/build_files/build_environment/install_deps_patches/osl.patch @@ -0,0 +1,12 @@ +--- a/src/shaders/CMakeLists.txt ++++ b/src/shaders/CMakeLists.txt +@@ -27,7 +27,7 @@ macro (osl_compile oslsrc objlist headers) + message (STATUS "cmd: ${CMAKE_CURRENT_BINARY_DIR}/../oslc/oslc ${oslsrc}") + endif () + add_custom_command (OUTPUT ${osofile} +- COMMAND "${CMAKE_CURRENT_BINARY_DIR}/../oslc/oslc" ${oslsrc} ++ COMMAND "${CMAKE_CURRENT_BINARY_DIR}/../oslc/oslc" "-o" ${osofile} ${oslsrc} + MAIN_DEPENDENCY ${oslsrc} + DEPENDS ${${headers}} ${oslsrc} "${CMAKE_CURRENT_BINARY_DIR}/stdosl.h" "${CMAKE_CURRENT_BINARY_DIR}/../oslc/oslc" + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) + |