From 56504a325fbde596e05e0c8cb25ea0c9dc41c91d Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Tue, 12 Jan 2010 15:02:28 -0700
Subject: Fixed 'Cannot generate a safe linker search path' CMake warning on
 Windows

---
 linden/indra/cmake/OPENAL.cmake | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/cmake/OPENAL.cmake b/linden/indra/cmake/OPENAL.cmake
index 71cbd67..60abef3 100644
--- a/linden/indra/cmake/OPENAL.cmake
+++ b/linden/indra/cmake/OPENAL.cmake
@@ -14,10 +14,11 @@ if (OPENAL)
   use_prebuilt_binary(openal)
   
   if (WINDOWS)
-    find_library(OPENAL_LIB
-      NAMES openal32
-      PATHS ${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release
+    set(OPENAL_LIB
+	  optimized ${ARCH_PREBUILT_DIRS_RELEASE}/openal32.lib
+	  debug ${ARCH_PREBUILT_DIRS_DEBUG}/openal32.lib
       )
+  
   elseif (DARWIN)
     # Look for for system's OpenAL.framework
     find_library(OPENAL_LIB
@@ -59,9 +60,9 @@ if (OPENAL)
   # ALUT_LIB
 
   if (WINDOWS)
-   find_library(ALUT_LIB
-     NAMES alut freealut
-     PATHS ${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release
+   set(ALUT_LIB
+	 optimized ${ARCH_PREBUILT_DIRS_RELEASE}/alut.lib
+	 debug ${ARCH_PREBUILT_DIRS_DEBUG}/alut.lib
      )
   elseif (DARWIN)
     find_library( ALUT_LIB
-- 
cgit v1.1