summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2012-11-15 21:31:32 -0500
committerNat Goodspeed <nat@lindenlab.com>2012-11-15 21:31:32 -0500
commit8edd1c72be078977c045792c815defc324fb2696 (patch)
treeca4a51ccf2af28ada2dda8da260a9ce7d60e55f3 /indra
parentdfdab39c5e1933b3bada15035a5aff2882eb479d (diff)
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.
Diffstat (limited to 'indra')
-rw-r--r--indra/cmake/LLPrimitive.cmake8
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake
index f15a2c2649..ab39cbb6be 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