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 /build_files | |
| 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
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/cmake/Modules/FindPugiXML.cmake | 2 | ||||
| -rw-r--r-- | build_files/cmake/platform/platform_apple.cmake | 8 |
2 files changed, 9 insertions, 1 deletions
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 |