diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-09-18 12:49:08 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-09-18 12:49:08 +0300 |
| commit | 5aa5066c3ba8f11ad5d435e4f571b3aabd31cb4e (patch) | |
| tree | f4ffa9aea6baf05cbbbaf11ae67a13848bdc62b1 /build_files/cmake/Modules/FindPCRE.cmake | |
| parent | eadf0f3d705c7f3cd2ba9e14f5568c421d88cb2a (diff) | |
| parent | d04eb330e873488d8b7cbe49da5600d6f64ea6db (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'build_files/cmake/Modules/FindPCRE.cmake')
| -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) |