bugfix [#21230] set-scene animation updates not working
[blender.git] / CMakeLists.txt
index 704e7be7b3a9c06e9e503782dbd33b6e1c844b39..8b690cdd81a3c23262a4dc1907c40fdda08a58c5 100644 (file)
@@ -181,11 +181,12 @@ IF(UNIX AND NOT APPLE)
                ENDIF(NOT SDL_FOUND)
        ENDIF(WITH_SDL)
 
+    SET(OPENEXR /usr CACHE FILEPATH "OPENEXR Directory")
        FIND_PATH(OPENEXR_INC
                ImfXdr.h
                PATHS
+        ${OPENEXR}/include/OpenEXR
                /usr/local/include/OpenEXR
-               /usr/include/OpenEXR
                /sw/include/OpenEXR
                /opt/local/include/OpenEXR
                /opt/csw/include/OpenEXR
@@ -193,9 +194,9 @@ IF(UNIX AND NOT APPLE)
        )
        SET(OPENEXR_LIB Half IlmImf Iex Imath)
 
-       SET(FFMPEG /usr)
+       SET(FFMPEG /usr CACHE FILEPATH "FFMPEG Directory")
        SET(FFMPEG_INC ${FFMPEG}/include)
-       SET(FFMPEG_LIB avformat avcodec avutil avdevice swscale)
+       SET(FFMPEG_LIB avformat avcodec avutil avdevice swscale CACHE STRING "FFMPEG Libraries")
        SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
   
        IF(WITH_FFTW3)
@@ -276,15 +277,10 @@ IF(WIN32)
        SET(PYTHON_LIB python31)
        SET(PYTHON_LIBPATH ${PYTHON}/lib)
 
-       IF(CMAKE_CL_64)
-               SET(WITH_OPENAL OFF)
-       ELSE(CMAKE_CL_64)
-               #SET(WITH_OPENAL ON)
-               SET(OPENAL ${LIBDIR}/openal)
-               SET(OPENAL_INCLUDE_DIR ${OPENAL}/include)
-               SET(OPENAL_LIBRARY wrap_oal)
-               SET(OPENAL_LIBPATH ${OPENAL}/lib)
-       ENDIF(CMAKE_CL_64)
+       SET(OPENAL ${LIBDIR}/openal)
+       SET(OPENAL_INCLUDE_DIR ${OPENAL}/include)
+       SET(OPENAL_LIBRARY wrap_oal)
+       SET(OPENAL_LIBPATH ${OPENAL}/lib)
 
        IF(WITH_JACK)
                SET(JACK ${LIBDIR}/jack)
@@ -689,4 +685,3 @@ ADD_SUBDIRECTORY(source/creator)
 IF(WITH_PLAYER)
        ADD_SUBDIRECTORY(source/blenderplayer)
 ENDIF(WITH_PLAYER)
-