[Bf-blender-cvs] [8b41cd5b96e] master: FIX: linker error with a 'make deps' library set and opencollada enabled.

[Ray Molenkamp]

Commit: 8b41cd5b96ea50b41aea2072517bdfd95b58ac8d
Author: Ray Molenkamp
Date:   Mon Sep 17 18:06:02 2018 -0600
Branches: master
https://developer.blender.org/rB8b41cd5b96ea50b41aea2072517bdfd95b58ac8d

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.

===================================================================

M	build_files/cmake/Modules/FindPCRE.cmake

===================================================================

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)