Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2012-11-15 21:16:27 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2012-11-15 21:16:27 +0400
commit2324c80f50f9cb95435b66ea370d38fd9617760b (patch)
treee9fe125c911541a232ba868c138f8f44531af97c /build_files/cmake/macros.cmake
parent1c9b548d92e8a76ac0a3c730bff5634d4628e971 (diff)
Cycles OSL: windows build system changes to support static OSL/OIIO.
Diffstat (limited to 'build_files/cmake/macros.cmake')
-rw-r--r--build_files/cmake/macros.cmake6
1 files changed, 5 insertions, 1 deletions
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index 2d9de5a5792..4f1d34f993c 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -700,7 +700,11 @@ macro(delayed_install
destination)
foreach(f ${files})
- set_property(GLOBAL APPEND PROPERTY DELAYED_INSTALL_FILES ${base}/${f})
+ if(IS_ABSOLUTE ${f})
+ set_property(GLOBAL APPEND PROPERTY DELAYED_INSTALL_FILES ${f})
+ else()
+ set_property(GLOBAL APPEND PROPERTY DELAYED_INSTALL_FILES ${base}/${f})
+ endif()
set_property(GLOBAL APPEND PROPERTY DELAYED_INSTALL_DESTINATIONS ${destination})
endforeach()
endmacro()