diff options
| author | Sybren A. Stüvel <sybren@stuvel.eu> | 2018-01-17 19:47:38 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2018-01-17 19:47:38 +0300 |
| commit | 10e6da1f2d61b9db7c47257310eb4580aa096c50 (patch) | |
| tree | 42fd298e750593b5ce99a5cf520605eba2200fb0 /build_files | |
| parent | 8e35a9e4c7fdeb09c31b7cc52955974748fb22c3 (diff) | |
| parent | 5d4ffb42a327b08542e3556e7a98f1bc14d21c70 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/build_environment/cmake/openjpeg.cmake | 7 |
1 files changed, 7 insertions, 0 deletions
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}) |