From 3581bba2822cf995423fdb8cc82af118a7808ac9 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Fri, 16 Nov 2012 15:39:58 -0500
Subject: [PATCH] Fix Boost shared-library version suffixes in
Copy3rdPartyLibs.cmake.
---
indra/cmake/Boost.cmake | 2 +-
indra/cmake/Copy3rdPartyLibs.cmake | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake
index dfa59bcb7e7..1acb2bbbfdf 100644
--- a/indra/cmake/Boost.cmake
+++ b/indra/cmake/Boost.cmake
@@ -16,10 +16,10 @@ if (STANDALONE)
else (STANDALONE)
use_prebuilt_binary(boost)
set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
+ set(BOOST_VERSION "1.52")
if (WINDOWS)
if(MSVC80)
- set(BOOST_VERSION 1_52)
set(BOOST_PROGRAM_OPTIONS_LIBRARY
optimized libboost_program_options-vc80-mt-${BOOST_VERSION}
debug libboost_program_options-vc80-mt-gd-${BOOST_VERSION})
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index a5483ba678e..c32e357da3d 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -254,12 +254,12 @@ elseif(LINUX)
libapr-1.so.0
libaprutil-1.so.0
libatk-1.0.so
- libboost_program_options-mt.so.1.48.0
- libboost_regex-mt.so.1.48.0
- libboost_thread-mt.so.1.48.0
- libboost_filesystem-mt.so.1.48.0
- libboost_signals-mt.so.1.48.0
- libboost_system-mt.so.1.48.0
+ libboost_program_options-mt.so.${BOOST_VERSION}.0
+ libboost_regex-mt.so.${BOOST_VERSION}.0
+ libboost_thread-mt.so.${BOOST_VERSION}.0
+ libboost_filesystem-mt.so.${BOOST_VERSION}.0
+ libboost_signals-mt.so.${BOOST_VERSION}.0
+ libboost_system-mt.so.${BOOST_VERSION}.0
libbreakpad_client.so.0
libcollada14dom.so
libcrypto.so.1.0.0
--
GitLab