Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartijn Berger <martijn.berger@gmail.com>2013-12-24 16:21:56 +0400
committerMartijn Berger <martijn.berger@gmail.com>2013-12-24 16:21:56 +0400
commite1b322b250c5b6e34e0c2118ee25aa4542442dcd (patch)
tree8bd2bef9932f7acb92525918a1c1ccc4a479883d
parent3ffba79ac63b327fc02ddb9e27526aa395d93fac (diff)
find_package(OPENAL) does not play nice with our current library naming nonvention
-rw-r--r--CMakeLists.txt17
1 files changed, 6 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0d53015e994..106c80762af 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1506,18 +1506,13 @@ elseif(WIN32)
if(WITH_OPENAL)
set(OPENAL ${LIBDIR}/openal)
set(OPENALDIR ${LIBDIR}/openal)
- find_package(OPENAL)
-
- if(NOT OPENAL_FOUND)
- message(WARNING "Setting static openAL paths")
- set(OPENAL_INCLUDE_DIR ${OPENAL}/include)
- if(MSVC11 OR MSVC12)
- set(OPENAL_LIBRARY openal32)
- else()
- set(OPENAL_LIBRARY wrap_oal)
- endif()
+ set(OPENAL_INCLUDE_DIR ${OPENAL}/include)
+ if(MSVC11 OR MSVC12)
+ set(OPENAL_LIBRARY openal32)
+ else()
+ set(OPENAL_LIBRARY wrap_oal)
+ endif()
set(OPENAL_LIBPATH ${OPENAL}/lib)
- endif()
endif()
if(WITH_CODEC_SNDFILE)