From 8edd1c72be078977c045792c815defc324fb2696 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Thu, 15 Nov 2012 21:31:32 -0500
Subject: [PATCH] Remove Boost version "1_45" baked into library names. On
Windows, LLPrimitive.cmake named four Boost libraries with names ending in
the string 1_45. Now that we're trying to upgrade Boost to 1.52, those
suffixes are inappropriate. Fortunately the libraries in our current Boost
package do not have version-stamped names, so we hope this fix can survive
for several Boost upgrades to come.
---
indra/cmake/LLPrimitive.cmake | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake
index f15a2c26497..ab39cbb6be8 100644
--- a/indra/cmake/LLPrimitive.cmake
+++ b/indra/cmake/LLPrimitive.cmake
@@ -15,10 +15,10 @@ if (WINDOWS)
optimized llprimitive
debug libcollada14dom22-d
optimized libcollada14dom22
- debug libboost_filesystem-vc100-mt-gd-1_45
- optimized libboost_filesystem-vc100-mt-1_45
- debug libboost_system-vc100-mt-gd-1_45
- optimized libboost_system-vc100-mt-1_45
+ debug libboost_filesystem-mt-gd
+ optimized libboost_filesystem-mt
+ debug libboost_system-mt-gd
+ optimized libboost_system-mt
)
else (WINDOWS)
set(LLPRIMITIVE_LIBRARIES
--
GitLab