diff options
| author | McCabe Maxsted | 2010-01-12 15:02:28 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2010-01-12 15:02:28 -0700 |
| commit | 56504a325fbde596e05e0c8cb25ea0c9dc41c91d (patch) | |
| tree | 0a41e583eb2b057fdc11ddc4105cbc907192b3f7 /linden | |
| parent | Fixed remember password checkbox (diff) | |
| download | meta-impy-56504a325fbde596e05e0c8cb25ea0c9dc41c91d.zip meta-impy-56504a325fbde596e05e0c8cb25ea0c9dc41c91d.tar.gz meta-impy-56504a325fbde596e05e0c8cb25ea0c9dc41c91d.tar.bz2 meta-impy-56504a325fbde596e05e0c8cb25ea0c9dc41c91d.tar.xz | |
Fixed 'Cannot generate a safe linker search path' CMake warning on Windows
Diffstat (limited to 'linden')
| -rw-r--r-- | linden/indra/cmake/OPENAL.cmake | 13 |
1 files changed, 7 insertions, 6 deletions
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) | |||
| 14 | use_prebuilt_binary(openal) | 14 | use_prebuilt_binary(openal) |
| 15 | 15 | ||
| 16 | if (WINDOWS) | 16 | if (WINDOWS) |
| 17 | find_library(OPENAL_LIB | 17 | set(OPENAL_LIB |
| 18 | NAMES openal32 | 18 | optimized ${ARCH_PREBUILT_DIRS_RELEASE}/openal32.lib |
| 19 | PATHS ${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release | 19 | debug ${ARCH_PREBUILT_DIRS_DEBUG}/openal32.lib |
| 20 | ) | 20 | ) |
| 21 | |||
| 21 | elseif (DARWIN) | 22 | elseif (DARWIN) |
| 22 | # Look for for system's OpenAL.framework | 23 | # Look for for system's OpenAL.framework |
| 23 | find_library(OPENAL_LIB | 24 | find_library(OPENAL_LIB |
| @@ -59,9 +60,9 @@ if (OPENAL) | |||
| 59 | # ALUT_LIB | 60 | # ALUT_LIB |
| 60 | 61 | ||
| 61 | if (WINDOWS) | 62 | if (WINDOWS) |
| 62 | find_library(ALUT_LIB | 63 | set(ALUT_LIB |
| 63 | NAMES alut freealut | 64 | optimized ${ARCH_PREBUILT_DIRS_RELEASE}/alut.lib |
| 64 | PATHS ${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release | 65 | debug ${ARCH_PREBUILT_DIRS_DEBUG}/alut.lib |
| 65 | ) | 66 | ) |
| 66 | elseif (DARWIN) | 67 | elseif (DARWIN) |
| 67 | find_library( ALUT_LIB | 68 | find_library( ALUT_LIB |