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:
authorRay Molenkamp <github@lazydodo.com>2021-02-01 21:35:23 +0300
committerRay Molenkamp <github@lazydodo.com>2021-02-01 21:35:23 +0300
commit038d72752d19b86c83404966873e7d2205366d38 (patch)
tree6531b602b9645e9b0932e98f4315d5ab13ffc831
parent59054d906fa9b539a14768101ba66c1182c13f0f (diff)
CMake/Windows: Fix build issue in lite+haru
Haru depends on some symbols defined in libtiff which will cause linker errors if not enabled. Disable haru if WITH_IMAGE_TIFF is off.
-rw-r--r--build_files/cmake/platform/platform_win32.cmake5
1 files changed, 5 insertions, 0 deletions
diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake
index 69a78ba7ca6..b9e4ec999c9 100644
--- a/build_files/cmake/platform/platform_win32.cmake
+++ b/build_files/cmake/platform/platform_win32.cmake
@@ -803,6 +803,11 @@ endif()
if(WITH_HARU)
if(EXISTS ${LIBDIR}/haru)
+ if(NOT WITH_IMAGE_TIFF)
+ # Some symbols in libharu are provided by libtiff.
+ message(WARNING "WITH_IMAGE_TIFF not enabled, disabling WITH_HARU")
+ set(WITH_HARU OFF)
+ endif()
set(HARU_FOUND On)
set(HARU_ROOT_DIR ${LIBDIR}/haru)
set(HARU_INCLUDE_DIRS ${HARU_ROOT_DIR}/include)