summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2011-03-14 21:00:27 -0700
committerMerov Linden <merov@lindenlab.com>2011-03-14 21:00:27 -0700
commite594d2585c291206a6f355868a7defa1bfb2c3db (patch)
tree9a7447713ae6a54243d5e350802aa59f6dfbb4f5
parent4223ab9acf282f52aac2bcf124f4b2912c2fe88e (diff)
Fix for Mac Debug build: no special debug libs for cares and jpeg libs
-rw-r--r--indra/cmake/CARes.cmake5
-rw-r--r--indra/cmake/JPEG.cmake5
2 files changed, 2 insertions, 8 deletions
diff --git a/indra/cmake/CARes.cmake b/indra/cmake/CARes.cmake
index 1850b706ac..a902b9d623 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 9514d59f64..6fa5f68935 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)