diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2021-01-26 17:27:57 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2021-01-26 17:55:27 +0300 |
| commit | 31f568c33692e543fc84179c783870c20844c3d0 (patch) | |
| tree | c28261085a76c9d38ec3b63d9f95479f7b7c3cbf | |
| parent | dde3ecc1a88f1838a77917d92341a0078b55c47e (diff) | |
Fix: incomplete integration of PugiXML and Potrace build options
Add them to the standard build configurations, disable properly when library
not found and print as part of configuration overview.
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | build_files/cmake/config/blender_full.cmake | 2 | ||||
| -rw-r--r-- | build_files/cmake/config/blender_lite.cmake | 2 | ||||
| -rw-r--r-- | build_files/cmake/config/blender_release.cmake | 2 | ||||
| -rw-r--r-- | build_files/cmake/platform/platform_unix.cmake | 5 |
5 files changed, 13 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 199fe9d3eeb..035cf81e1b3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1857,6 +1857,8 @@ if(FIRST_RUN) info_cfg_option(WITH_OPENCOLORIO) info_cfg_option(WITH_OPENIMAGEDENOISE) info_cfg_option(WITH_OPENVDB) + info_cfg_option(WITH_POTRACE) + info_cfg_option(WITH_PUGIXML) info_cfg_option(WITH_QUADRIFLOW) info_cfg_option(WITH_TBB) info_cfg_option(WITH_USD) diff --git a/build_files/cmake/config/blender_full.cmake b/build_files/cmake/config/blender_full.cmake index 08065ec0276..aab997ab453 100644 --- a/build_files/cmake/config/blender_full.cmake +++ b/build_files/cmake/config/blender_full.cmake @@ -44,6 +44,8 @@ set(WITH_OPENMP ON CACHE BOOL "" FORCE) set(WITH_OPENSUBDIV ON CACHE BOOL "" FORCE) set(WITH_OPENVDB ON CACHE BOOL "" FORCE) set(WITH_OPENVDB_BLOSC ON CACHE BOOL "" FORCE) +set(WITH_POTRACE ON CACHE BOOL "" FORCE) +set(WITH_PUGIXML ON CACHE BOOL "" FORCE) set(WITH_NANOVDB ON CACHE BOOL "" FORCE) set(WITH_POTRACE ON CACHE BOOL "" FORCE) set(WITH_PYTHON_INSTALL ON CACHE BOOL "" FORCE) diff --git a/build_files/cmake/config/blender_lite.cmake b/build_files/cmake/config/blender_lite.cmake index 4150094e9f5..480548abca7 100644 --- a/build_files/cmake/config/blender_lite.cmake +++ b/build_files/cmake/config/blender_lite.cmake @@ -51,6 +51,8 @@ set(WITH_OPENIMAGEIO OFF CACHE BOOL "" FORCE) set(WITH_OPENMP OFF CACHE BOOL "" FORCE) set(WITH_OPENSUBDIV OFF CACHE BOOL "" FORCE) set(WITH_OPENVDB OFF CACHE BOOL "" FORCE) +set(WITH_POTRACE OFF CACHE BOOL "" FORCE) +set(WITH_PUGIXML OFF CACHE BOOL "" FORCE) set(WITH_NANOVDB OFF CACHE BOOL "" FORCE) set(WITH_QUADRIFLOW OFF CACHE BOOL "" FORCE) set(WITH_SDL OFF CACHE BOOL "" FORCE) diff --git a/build_files/cmake/config/blender_release.cmake b/build_files/cmake/config/blender_release.cmake index fd3225b0287..96101ee7bcc 100644 --- a/build_files/cmake/config/blender_release.cmake +++ b/build_files/cmake/config/blender_release.cmake @@ -45,6 +45,8 @@ set(WITH_OPENMP ON CACHE BOOL "" FORCE) set(WITH_OPENSUBDIV ON CACHE BOOL "" FORCE) set(WITH_OPENVDB ON CACHE BOOL "" FORCE) set(WITH_OPENVDB_BLOSC ON CACHE BOOL "" FORCE) +set(WITH_POTRACE ON CACHE BOOL "" FORCE) +set(WITH_PUGIXML ON CACHE BOOL "" FORCE) set(WITH_NANOVDB ON CACHE BOOL "" FORCE) set(WITH_POTRACE ON CACHE BOOL "" FORCE) set(WITH_PYTHON_INSTALL ON CACHE BOOL "" FORCE) diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake index abacd0500e5..a2448829206 100644 --- a/build_files/cmake/platform/platform_unix.cmake +++ b/build_files/cmake/platform/platform_unix.cmake @@ -352,6 +352,11 @@ endif() if(WITH_PUGIXML) find_package_wrapper(PugiXML) + + if (NOT PUGIXML_FOUND) + set(WITH_PUGIXML OFF) + message(STATUS "PugiXML not found, disabling WITH_PUGIXML") + endif() endif() if(WITH_OPENIMAGEIO) |