[Bf-blender-cvs] [a8fc44299b0] master: external_libs: Add openjpeg to the mavc lib folders for cycles standalone.

[Ray Molenkamp]

Commit: a8fc44299b04129573ed63af5649a9c5d3d83a13
Author: Ray Molenkamp
Date:   Wed Jan 17 07:45:05 2018 -0700
Branches: master
https://developer.blender.org/rBa8fc44299b04129573ed63af5649a9c5d3d83a13

external_libs: Add openjpeg to the mavc lib folders for cycles standalone.

===================================================================

M	build_files/build_environment/cmake/openjpeg.cmake

===================================================================

diff --git a/build_files/build_environment/cmake/openjpeg.cmake b/build_files/build_environment/cmake/openjpeg.cmake
index 16ac387ff54..37f9e6de32b 100644
--- a/build_files/build_environment/cmake/openjpeg.cmake
+++ b/build_files/build_environment/cmake/openjpeg.cmake
@@ -49,6 +49,13 @@ if(MSVC)
 		CMAKE_ARGS ${OPENJPEG_EXTRA_ARGS} -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openjpeg_msvc -DBUILD_SHARED_LIBS=Off -DBUILD_THIRDPARTY=OFF 
 		INSTALL_DIR ${LIBDIR}/openjpeg_msvc
 	)
+	if(BUILD_MODE STREQUAL Release)
+		ExternalProject_Add_Step(external_openjpeg_msvc after_install
+			COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openjpeg_msvc/lib ${HARVEST_TARGET}/openjpeg/lib &&
+					${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openjpeg_msvc/include ${HARVEST_TARGET}/openjpeg/include
+			DEPENDEES install
+		)
+	endif()
 endif()
 
 set(OPENJPEG_LIBRARY libopenjpeg${LIBEXT})