From 4eec9dd54eb469157509048bc5ca9ac3693a8d18 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Fri, 29 Oct 2010 15:06:09 -0500
Subject: [PATCH] SH-262 Fix for debug build on windows.
---
indra/cmake/LLPrimitive.cmake | 9 +++++----
indra/newview/CMakeLists.txt | 1 -
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake
index fae1ef2a512..dd55bbfc50c 100644
--- a/indra/cmake/LLPrimitive.cmake
+++ b/indra/cmake/LLPrimitive.cmake
@@ -11,13 +11,14 @@ set(LLPRIMITIVE_INCLUDE_DIRS
)
if (WINDOWS)
- set(LLPRIMITIVE_LIBRARIES
- llprimitive
+ set(LLPRIMITIVE_LIBRARIES
+ debug llprimitive
+ optimized llprimtive
debug libcollada14dom21-d
- debug libboost_filesystem-d
- debug libboost_system-d
optimized libcollada14dom21
+ debug libboost_filesystem-d
optimized libboost_filesystem
+ debug libboost_system-d
optimized libboost_system
)
else (WINDOWS)
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 0997c80e46d..2b4a2dfdb04 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1270,7 +1270,6 @@ if (WINDOWS)
${DINPUT_LIBRARY}
${DXGUID_LIBRARY}
kernel32
- libboost_system
odbc32
odbccp32
ole32
--
GitLab