SVN commit 642486 by mlaurent: Fix variable M +4 -4 FindFFmpeg.cmake M +4 -4 FindXCB.cmake M +4 -4 FindXine.cmake --- trunk/KDE/kdemultimedia/cmake/modules/FindFFmpeg.cmake #642485:642486 @@ -65,13 +65,13 @@ endif (FFMPEG_LIBRARIES) if (FFMPEG_FOUND) - if (NOT FFMPEG_FIND_QUIETLY) + if (NOT FFmpeg_FIND_QUIETLY) message(STATUS "Found FFMPEG: ${FFMPEG_LIBRARIES} ${FFMPEG_INCLUDE_DIR}") - endif (NOT FFMPEG_FIND_QUIETLY) + endif (NOT FFmpeg_FIND_QUIETLY) else (FFMPEG_FOUND) - if (FFMPEG_FIND_REQUIRED) + if (FFmpeg_FIND_REQUIRED) message(FATAL_ERROR "Could NOT find FFMPEG") - endif (FFMPEG_FIND_REQUIRED) + endif (FFmpeg_FIND_REQUIRED) endif (FFMPEG_FOUND) MARK_AS_ADVANCED(FFMPEG_LIBRARIES) --- trunk/KDE/kdemultimedia/cmake/modules/FindXCB.cmake #642485:642486 @@ -41,13 +41,13 @@ ENDIF (LIBXCB_INCLUDE_DIR AND LIBXCB_LIBRARIES) IF (LIBXCB_FOUND) - IF (NOT LibXCB_FIND_QUIETLY) + IF (NOT XCB_FIND_QUIETLY) MESSAGE(STATUS "Found LibXCB: ${LIBXCB_LIBRARIES}") - ENDIF (NOT LibXCB_FIND_QUIETLY) + ENDIF (NOT XCB_FIND_QUIETLY) ELSE (LIBXCB_FOUND) - IF (LibXCB_FIND_REQUIRED) + IF (XCB_FIND_REQUIRED) MESSAGE(FATAL_ERROR "Could NOT find LibXCB") - ENDIF (LibXCB_FIND_REQUIRED) + ENDIF (XCB_FIND_REQUIRED) ENDIF (LIBXCB_FOUND) MARK_AS_ADVANCED(LIBXCB_INCLUDE_DIR LIBXCB_LIBRARIES XCBPROC_EXECUTABLE) --- trunk/KDE/kdemultimedia/cmake/modules/FindXine.cmake #642485:642486 @@ -50,17 +50,17 @@ CHECK_C_SOURCE_COMPILES("#include \nint main()\n{\n xine_open_video_driver(xine_new(), \"auto\", XINE_VISUAL_TYPE_XCB, NULL);\n return 0;\n}\n" XINE_XCB_FOUND) if (XINE_FOUND) - if (NOT XINE_FIND_QUIETLY) + if (NOT Xine_FIND_QUIETLY) message(STATUS "Found XINE: ${XINE_LIBRARY}") - endif (NOT XINE_FIND_QUIETLY) + endif (NOT Xine_FIND_QUIETLY) if(XINECONFIG_EXECUTABLE) EXEC_PROGRAM(${XINECONFIG_EXECUTABLE} ARGS --plugindir RETURN_VALUE _return_VALUE OUTPUT_VARIABLE XINEPLUGINSDIR) MESSAGE(STATUS "XINEPLUGINSDIR :<${XINEPLUGINSDIR}>") endif(XINECONFIG_EXECUTABLE) else (XINE_FOUND) - if (XINE_FIND_REQUIRED) + if (Xine_FIND_REQUIRED) message(FATAL_ERROR "Could NOT find XINE 1.1.1 or greater") - endif (XINE_FIND_REQUIRED) + endif (Xine_FIND_REQUIRED) endif (XINE_FOUND) MARK_AS_ADVANCED(XINE_INCLUDE_DIR XINE_LIBRARY XINEPLUGINSDIR)