Commit: e1b322b250c5b6e34e0c2118ee25aa4542442dcd
Author: Martijn Berger
Date: Tue Dec 24 13:21:56 2013 +0100
http://developer.blender.org/rBe1b322b250c5b6e34e0c2118ee25aa4542442dcd
find_package(OPENAL) does not play nice with our current library naming
nonvention
===================================================================
M CMakeLists.txt
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0d53015..106c807 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)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
