From cf100fc36c30dccabc17b7a06a25f190e94ace89 Mon Sep 17 00:00:00 2001 From: Sean Devin Date: Sat, 5 Oct 2013 08:27:30 +1000 Subject: [PATCH] Do not use pcre on linux64 Conflicts: indra/newview/viewer_manifest.py Merged with a patch that I wrote. The linux pcre prebuilts can also be removed from install.xml, but for now leaving them there because the prebuilts are still in use by the libcollada prebuilt (probably should just move them into that git repository). --- indra/cmake/Colladadom.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/cmake/Colladadom.cmake b/indra/cmake/Colladadom.cmake index 9041803d5..a113ee2cf 100644 --- a/indra/cmake/Colladadom.cmake +++ b/indra/cmake/Colladadom.cmake @@ -10,9 +10,9 @@ if (STANDALONE) else (STANDALONE) use_prebuilt_binary(colladadom) - if (NOT WINDOWS) + if (NOT WINDOWS AND NOT LINUX) use_prebuilt_binary(pcre) - endif (NOT WINDOWS) + endif (NOT WINDOWS AND NOT LINUX) if (NOT DARWIN AND NOT WINDOWS) use_prebuilt_binary(libxml)