diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2018-09-18 03:06:02 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2018-09-18 03:06:02 +0300 |
| commit | 8b41cd5b96ea50b41aea2072517bdfd95b58ac8d (patch) | |
| tree | 69a5231e92f7349c4447b1bb6c9c8fc4d5ce6e87 /build_files | |
| parent | 16b8d223b718925d6aadd30b802967f010076f5d (diff) | |
FIX: linker error with a 'make deps' library set and opencollada enabled.
PCRE_LIBRARIES was not being set if the pcre library was found but not the headers.
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/cmake/Modules/FindPCRE.cmake | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/build_files/cmake/Modules/FindPCRE.cmake b/build_files/cmake/Modules/FindPCRE.cmake index 20b5c1d5c28..1fd56dc1234 100644 --- a/build_files/cmake/Modules/FindPCRE.cmake +++ b/build_files/cmake/Modules/FindPCRE.cmake @@ -56,8 +56,13 @@ INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(PCRE DEFAULT_MSG PCRE_LIBRARY PCRE_INCLUDE_DIR) +# With 'make deps' precompiled libs, opencollada ships with a copy of libpcre +# but not the headers, ${PCRE_LIBRARY} will be valid in this case +# but PCRE_FOUND will be FALSE. So we set this variable outside of +# the IF(PCRE_FOUND) below to allow blender to successfully link. +SET(PCRE_LIBRARIES ${PCRE_LIBRARY}) + IF(PCRE_FOUND) - SET(PCRE_LIBRARIES ${PCRE_LIBRARY}) SET(PCRE_INCLUDE_DIRS ${PCRE_INCLUDE_DIR}) ENDIF(PCRE_FOUND) |