marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

CMake: Rename OpenAL_LIBRARY to OpenAL_LIBRARIES for MSVC to be more consistent with the other platforms.

issue1247
Sven Eberhardt 2014-09-29 23:07:05 +02:00
parent 9891ff048b
commit bab89a6514
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmake/FindAudio.cmake
View File

@ -38,11 +38,11 @@ macro(__FINDAUDIO_FINDOPENAL)
find_library(Alut_LIBRARY NAMES alut_static alut)
if (MSVC)
if(${FIND_LIBRARY_USE_LIB64_PATHS})
find_library(OpenAL_LIBRARY NAMES OpenAL64)
find_library(OpenAL_LIBRARIES NAMES OpenAL64)
else()
find_library(OpenAL_LIBRARY NAMES OpenAL32)
find_library(OpenAL_LIBRARIES NAMES OpenAL32)
endif()
if(NOT OpenAL_LIBRARY)
if(NOT OpenAL_LIBRARIES)
set(OpenAL_FOUND FALSE)
endif()
endif()
@ -93,9 +93,6 @@ if(Audio_TK STREQUAL "OpenAL")
set(Audio_LIBRARIES ${OpenAL_LIBRARIES} ${OggVorbis_LIBRARIES})
set(Audio_INCLUDE_DIRS ${OpenAL_INCLUDE_DIRS} ${OggVorbis_INCLUDE_DIRS})
set(Audio_LIBRARIES ${Audio_LIBRARIES} ${Alut_LIBRARIES})
if (NOT(APPLE))
set(Audio_LIBRARIES ${Audio_LIBRARIES} ${OpenAL_LIBRARY})
endif()
set(Audio_INCLUDE_DIRS ${Audio_INCLUDE_DIRS} ${Alut_INCLUDE_DIRS})
endif()
elseif(Audio_TK STREQUAL "SDL_Mixer")