From e594d2585c291206a6f355868a7defa1bfb2c3db Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Mon, 14 Mar 2011 21:00:27 -0700
Subject: [PATCH] Fix for Mac Debug build: no special debug libs for cares and
jpeg libs
---
indra/cmake/CARes.cmake | 5 +----
indra/cmake/JPEG.cmake | 5 +----
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/indra/cmake/CARes.cmake b/indra/cmake/CARes.cmake
index 1850b706acc..a902b9d6230 100644
--- a/indra/cmake/CARes.cmake
+++ b/indra/cmake/CARes.cmake
@@ -13,10 +13,7 @@ else (STANDALONE)
if (WINDOWS)
set(CARES_LIBRARIES areslib)
elseif (DARWIN)
- set(CARES_LIBRARIES
- optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libcares.a
- debug ${ARCH_PREBUILT_DIRS_DEBUG}/libcares.a
- )
+ set(CARES_LIBRARIES libcares.a)
else (WINDOWS)
set(CARES_LIBRARIES cares)
endif (WINDOWS)
diff --git a/indra/cmake/JPEG.cmake b/indra/cmake/JPEG.cmake
index 9514d59f64b..6fa5f68935e 100644
--- a/indra/cmake/JPEG.cmake
+++ b/indra/cmake/JPEG.cmake
@@ -12,10 +12,7 @@ else (STANDALONE)
if (LINUX)
set(JPEG_LIBRARIES jpeg)
elseif (DARWIN)
- set(JPEG_LIBRARIES
- optimized ${ARCH_PREBUILT_DIRS_RELEASE}/liblljpeg.a
- debug ${ARCH_PREBUILT_DIRS_DEBUG}/liblljpeg.a
- )
+ set(JPEG_LIBRARIES liblljpeg.a)
elseif (WINDOWS)
set(JPEG_LIBRARIES jpeglib)
endif (LINUX)
--
GitLab