Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
BlenderPhi
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
raas
BlenderPhi
Commits
33b8063b
Commit
33b8063b
authored
Feb 1, 2021
by
Ankit Meel
Browse files
Options
Downloads
Patches
Plain Diff
CMake: Remove duplicated code for Haru-TIFF dependency.
parent
038d7275
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMakeLists.txt
+3
-0
3 additions, 0 deletions
CMakeLists.txt
build_files/cmake/platform/platform_apple.cmake
+0
-5
0 additions, 5 deletions
build_files/cmake/platform/platform_apple.cmake
build_files/cmake/platform/platform_win32.cmake
+0
-5
0 additions, 5 deletions
build_files/cmake/platform/platform_win32.cmake
with
3 additions
and
10 deletions
CMakeLists.txt
+
3
−
0
View file @
33b8063b
...
@@ -731,6 +731,9 @@ set_and_warn_dependency(WITH_OPENVDB WITH_NANOVDB OFF)
...
@@ -731,6 +731,9 @@ set_and_warn_dependency(WITH_OPENVDB WITH_NANOVDB OFF)
# OpenVDB uses 'half' type from OpenEXR & fails to link without OpenEXR enabled.
# OpenVDB uses 'half' type from OpenEXR & fails to link without OpenEXR enabled.
set_and_warn_dependency
(
WITH_IMAGE_OPENEXR WITH_OPENVDB OFF
)
set_and_warn_dependency
(
WITH_IMAGE_OPENEXR WITH_OPENVDB OFF
)
# Haru needs `TIFFFaxBlackCodes` & `TIFFFaxWhiteCodes` symbols from TIFF.
set_and_warn_dependency
(
WITH_IMAGE_TIFF WITH_HARU OFF
)
# auto enable openimageio for cycles
# auto enable openimageio for cycles
if
(
WITH_CYCLES
)
if
(
WITH_CYCLES
)
set
(
WITH_OPENIMAGEIO ON
)
set
(
WITH_OPENIMAGEIO ON
)
...
...
This diff is collapsed.
Click to expand it.
build_files/cmake/platform/platform_apple.cmake
+
0
−
5
View file @
33b8063b
...
@@ -434,11 +434,6 @@ if(WITH_HARU)
...
@@ -434,11 +434,6 @@ if(WITH_HARU)
message
(
WARNING
"Haru not found, disabling WITH_HARU"
)
message
(
WARNING
"Haru not found, disabling WITH_HARU"
)
set
(
WITH_HARU OFF
)
set
(
WITH_HARU OFF
)
endif
()
endif
()
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
()
endif
()
endif
()
if
(
EXISTS
${
LIBDIR
}
)
if
(
EXISTS
${
LIBDIR
}
)
...
...
This diff is collapsed.
Click to expand it.
build_files/cmake/platform/platform_win32.cmake
+
0
−
5
View file @
33b8063b
...
@@ -803,11 +803,6 @@ endif()
...
@@ -803,11 +803,6 @@ endif()
if
(
WITH_HARU
)
if
(
WITH_HARU
)
if
(
EXISTS
${
LIBDIR
}
/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_FOUND On
)
set
(
HARU_ROOT_DIR
${
LIBDIR
}
/haru
)
set
(
HARU_ROOT_DIR
${
LIBDIR
}
/haru
)
set
(
HARU_INCLUDE_DIRS
${
HARU_ROOT_DIR
}
/include
)
set
(
HARU_INCLUDE_DIRS
${
HARU_ROOT_DIR
}
/include
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment