Changeset 157562 in webkit
- Timestamp:
- Oct 17, 2013 12:46:22 AM (10 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r157555 r157562 1 2013-10-17 Afonso R. Costa Jr. <afonso.costa@samsung.com> 2 3 [CMAKE] Update code to take advantage of CMake version 2.8.3+. 4 https://bugs.webkit.org/show_bug.cgi?id=97516 5 6 Reviewed by Gyuyoung Kim. 7 8 CMake's version was changed to 2.8.3. So, these files below 9 can be simplified to take advantage of CMake's new version. 10 11 * Source/cmake/FindCairo.cmake: Simplified according to CMake 2.8.3+. 12 * Source/cmake/FindGStreamer.cmake: Ditto. 13 1 14 2013-10-16 Ryosuke Niwa <rniwa@webkit.org> 2 15 -
trunk/Source/cmake/FindCairo.cmake
r136790 r157562 30 30 31 31 find_package(PkgConfig) 32 pkg_check_modules(PC_CAIRO cairo) # FIXME: After we require CMake 2.8.2 we can pass QUIET to this call.32 pkg_check_modules(PC_CAIRO QUIET cairo) 33 33 34 34 find_path(CAIRO_INCLUDE_DIRS … … 62 62 endif () 63 63 64 # FIXME: Should not be needed anymore once we start depending on CMake 2.8.3 65 set(VERSION_OK TRUE) 66 if (Cairo_FIND_VERSION) 67 if (Cairo_FIND_VERSION_EXACT) 68 if ("${Cairo_FIND_VERSION}" VERSION_EQUAL "${CAIRO_VERSION}") 69 # FIXME: Use if (NOT ...) with CMake 2.8.2+ to get rid of the ELSE block 70 else () 71 set(VERSION_OK FALSE) 72 endif () 73 else () 74 if ("${Cairo_FIND_VERSION}" VERSION_GREATER "${CAIRO_VERSION}") 75 set(VERSION_OK FALSE) 76 endif () 77 endif () 64 if ("${Cairo_FIND_VERSION}" VERSION_GREATER "${CAIRO_VERSION}") 65 message(FATAL_ERROR "Required version ("${Cairo_FIND_VERSION}") is higher than found version ("${CAIRO_VERSION}")") 78 66 endif () 79 67 80 68 include(FindPackageHandleStandardArgs) 81 FIND_PACKAGE_HANDLE_STANDARD_ARGS(Cairo DEFAULT_MSG CAIRO_INCLUDE_DIRS CAIRO_LIBRARIES VERSION_OK) 69 FIND_PACKAGE_HANDLE_STANDARD_ARGS(Cairo REQUIRED_VARS CAIRO_INCLUDE_DIRS CAIRO_LIBRARIES 70 VERSION_VAR CAIRO_VERSION) -
trunk/Source/cmake/FindGStreamer.cmake
r149968 r157562 54 54 # _library is the component's library name (eg. "gstreamer-1.0" or "gstvideo-1.0") 55 55 macro(FIND_GSTREAMER_COMPONENT _component_prefix _pkgconfig_name _header _library) 56 # FIXME: The QUIET keyword can be used once we require CMake 2.8.2. 57 pkg_check_modules(PC_${_component_prefix} ${_pkgconfig_name}) 56 pkg_check_modules(PC_${_component_prefix} QUIET ${_pkgconfig_name}) 58 57 59 58 find_path(${_component_prefix}_INCLUDE_DIRS … … 95 94 endif () 96 95 97 # FIXME: With CMake 2.8.3 we can just pass GSTREAMER_VERSION to FIND_PACKAGE_HANDLE_STANDARD_ARGS as VERSION_VAR 98 # and remove the version check here (GSTREAMER_FIND_VERSION would be passed to FIND_PACKAGE). 99 set(VERSION_OK TRUE) 100 if (GSTREAMER_FIND_VERSION_EXACT) 101 if (NOT(("${GSTREAMER_FIND_VERSION}" VERSION_EQUAL "${GSTREAMER_VERSION}"))) 102 set(VERSION_OK FALSE) 103 endif () 104 else () 105 if ("${GSTREAMER_VERSION}" VERSION_LESS "${GSTREAMER_FIND_VERSION}") 106 set(VERSION_OK FALSE) 107 endif () 96 if ("${GStreamer_FIND_VERSION}" VERSION_GREATER "${GSTREAMER_VERSION}") 97 message(FATAL_ERROR "Required version ("${GStreamer_FIND_VERSION}") is higher than found version ("${GSTREAMER_VERSION}")") 108 98 endif () 109 99 … … 121 111 # 3. Process the COMPONENTS passed to FIND_PACKAGE 122 112 # ------------------------------------------------ 123 set(_GSTREAMER_REQUIRED_VARS GSTREAMER_INCLUDE_DIRS GSTREAMER_LIBRARIES VERSION_OKGSTREAMER_BASE_INCLUDE_DIRS GSTREAMER_BASE_LIBRARIES)113 set(_GSTREAMER_REQUIRED_VARS GSTREAMER_INCLUDE_DIRS GSTREAMER_LIBRARIES GSTREAMER_VERSION GSTREAMER_BASE_INCLUDE_DIRS GSTREAMER_BASE_LIBRARIES) 124 114 125 115 foreach (_component ${GStreamer_FIND_COMPONENTS}) … … 131 121 132 122 include(FindPackageHandleStandardArgs) 133 FIND_PACKAGE_HANDLE_STANDARD_ARGS(GStreamer DEFAULT_MSG ${_GSTREAMER_REQUIRED_VARS}) 123 FIND_PACKAGE_HANDLE_STANDARD_ARGS(GStreamer REQUIRED_VARS _GSTREAMER_REQUIRED_VARS 124 VERSION_VAR GSTREAMER_VERSION)
Note: See TracChangeset
for help on using the changeset viewer.