diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2020-03-27 16:24:52 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2020-04-02 18:09:01 +0300 |
| commit | 5159ba6b333b27b247ffe0b950fa40c1dd7d2654 (patch) | |
| tree | f74fe97e256bfc2a22846497f44da080573801b8 /build_files/cmake/platform | |
| parent | 2aa938b0ae77f4287a3c7f43b823cc648138c4ce (diff) | |
Fix (harmless) PCRE not found warning when configuring CMake on Linux
Differential Revision: https://developer.blender.org/D7309
Diffstat (limited to 'build_files/cmake/platform')
| -rw-r--r-- | build_files/cmake/platform/platform_apple.cmake | 6 | ||||
| -rw-r--r-- | build_files/cmake/platform/platform_unix.cmake | 10 |
2 files changed, 10 insertions, 6 deletions
diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake index 620a078f412..f5f8c209d9d 100644 --- a/build_files/cmake/platform/platform_apple.cmake +++ b/build_files/cmake/platform/platform_apple.cmake @@ -222,12 +222,10 @@ if(WITH_OPENCOLLADA) -lMathMLSolver -lGeneratedSaxParser -lbuffer -lftoa -lUTF - ${OPENCOLLADA_LIBPATH}/libxml2.a ) - # PCRE is bundled with openCollada - # set(PCRE ${LIBDIR}/pcre) - # set(PCRE_LIBPATH ${PCRE}/lib) + # PCRE and XML2 are bundled with OpenCollada. set(PCRE_LIBRARIES pcre) + set(XML2_LIBRARIES xml2) endif() if(WITH_SDL) diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake index c034e7028af..3f73916daf3 100644 --- a/build_files/cmake/platform/platform_unix.cmake +++ b/build_files/cmake/platform/platform_unix.cmake @@ -195,8 +195,14 @@ endif() if(WITH_OPENCOLLADA) find_package_wrapper(OpenCOLLADA) if(OPENCOLLADA_FOUND) - find_package_wrapper(XML2) - find_package_wrapper(PCRE) + if(WITH_STATIC_LIBS) + # PCRE and XML2 are bundled with OpenCollada. + set(PCRE_LIBRARIES pcre) + set(XML2_LIBRARIES xml2) + else() + find_package_wrapper(XML2) + find_package_wrapper(PCRE) + endif() else() set(WITH_OPENCOLLADA OFF) endif() |