diff options
| author | Sebastián Barschkis <sebbas@sebbas.org> | 2020-12-02 17:17:58 +0300 |
|---|---|---|
| committer | Sebastián Barschkis <sebbas@sebbas.org> | 2020-12-02 17:18:05 +0300 |
| commit | f8d1378b8457faffbe85c773592a1337c8dcd6f2 (patch) | |
| tree | 81bd9dde3ec3d035c2785ef972aee1cdb209cef0 | |
| parent | d40f5d41af0ad4183ec42d03cb5d0f56788150b6 (diff) | |
Deps: Additional changes for PugiXML on macOS
This commit expands the Windows-specific code in rBdca9aa0053f7 and Linux-specific code in rB33b7d53df08a.
It also fixes a capitalization issue in FindPugiXML.cmake
| -rw-r--r-- | CMakeLists.txt | 10 | ||||
| -rw-r--r-- | build_files/cmake/Modules/FindPugiXML.cmake | 2 | ||||
| -rw-r--r-- | build_files/cmake/platform/platform_apple.cmake | 8 |
3 files changed, 12 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a192aacfa3b..81fe4739da4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -178,9 +178,7 @@ mark_as_advanced(BUILDINFO_OVERRIDE_TIME) option(WITH_IK_ITASC "Enable ITASC IK solver (only disable for development & for incompatible C++ compilers)" ON) option(WITH_IK_SOLVER "Enable Legacy IK solver (only disable for development)" ON) option(WITH_FFTW3 "Enable FFTW3 support (Used for smoke, ocean sim, and audio effects)" ON) -if(NOT APPLE) - option(WITH_PUGIXML "Enable PugiXML support (Used for OpenImageIO, Grease Pencil SVG export)" ON) -endif() +option(WITH_PUGIXML "Enable PugiXML support (Used for OpenImageIO, Grease Pencil SVG export)" ON) option(WITH_BULLET "Enable Bullet (Physics Engine)" ON) option(WITH_SYSTEM_BULLET "Use the systems bullet library (currently unsupported due to missing features in upstream!)" ) mark_as_advanced(WITH_SYSTEM_BULLET) @@ -701,10 +699,8 @@ set_and_warn_dependency(WITH_BOOST WITH_OPENCOLORIO OFF) set_and_warn_dependency(WITH_BOOST WITH_QUADRIFLOW OFF) set_and_warn_dependency(WITH_BOOST WITH_USD OFF) set_and_warn_dependency(WITH_BOOST WITH_ALEMBIC OFF) -if(NOT APPLE) - set_and_warn_dependency(WITH_PUGIXML WITH_CYCLES_OSL OFF) - set_and_warn_dependency(WITH_PUGIXML WITH_OPENIMAGEIO OFF) -endif() +set_and_warn_dependency(WITH_PUGIXML WITH_CYCLES_OSL OFF) +set_and_warn_dependency(WITH_PUGIXML WITH_OPENIMAGEIO OFF) if(WITH_BOOST AND NOT (WITH_CYCLES OR WITH_OPENIMAGEIO OR WITH_INTERNATIONAL OR WITH_OPENVDB OR WITH_OPENCOLORIO OR WITH_USD OR WITH_ALEMBIC)) diff --git a/build_files/cmake/Modules/FindPugiXML.cmake b/build_files/cmake/Modules/FindPugiXML.cmake index 5dced1c6df8..f5b1dfce4af 100644 --- a/build_files/cmake/Modules/FindPugiXML.cmake +++ b/build_files/cmake/Modules/FindPugiXML.cmake @@ -49,7 +49,7 @@ FIND_LIBRARY(PUGIXML_LIBRARY # handle the QUIETLY and REQUIRED arguments and set PUGIXML_FOUND to TRUE if # all listed variables are TRUE INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(PUGIXML DEFAULT_MSG +FIND_PACKAGE_HANDLE_STANDARD_ARGS(PugiXML DEFAULT_MSG PUGIXML_LIBRARY PUGIXML_INCLUDE_DIR) IF(PUGIXML_FOUND) diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake index 586c72c9c7e..6baa2f3d855 100644 --- a/build_files/cmake/platform/platform_apple.cmake +++ b/build_files/cmake/platform/platform_apple.cmake @@ -270,6 +270,14 @@ if(WITH_INTERNATIONAL OR WITH_CODEC_FFMPEG) string(APPEND PLATFORM_LINKFLAGS " -liconv") # boost_locale and ffmpeg needs it ! endif() +if(WITH_PUGIXML) + find_package(PugiXML) + if(NOT PUGIXML_FOUND) + message(WARNING "PugiXML not found, disabling WITH_PUGIXML") + set(WITH_PUGIXML OFF) + endif() +endif() + if(WITH_OPENIMAGEIO) find_package(OpenImageIO) list(APPEND OPENIMAGEIO_LIBRARIES |