Title: [197297] trunk
- Revision
- 197297
- Author
- [email protected]
- Date
- 2016-02-28 12:11:02 -0800 (Sun, 28 Feb 2016)
Log Message
[cmake] Allow using FindGLIB in case glib is optional dependency.
https://bugs.webkit.org/show_bug.cgi?id=154796
Patch by Konstantin Tokarev <[email protected]> on 2016-02-28
Reviewed by Michael Catanzaro.
FindGLIB caused internal CMake error in case GLIBCONFIG_INCLUDE_DIR is
not defined.
* Source/cmake/FindGLIB.cmake:
Modified Paths
Diff
Modified: trunk/ChangeLog (197296 => 197297)
--- trunk/ChangeLog 2016-02-28 19:14:26 UTC (rev 197296)
+++ trunk/ChangeLog 2016-02-28 20:11:02 UTC (rev 197297)
@@ -1,3 +1,15 @@
+2016-02-28 Konstantin Tokarev <[email protected]>
+
+ [cmake] Allow using FindGLIB in case glib is optional dependency.
+ https://bugs.webkit.org/show_bug.cgi?id=154796
+
+ Reviewed by Michael Catanzaro.
+
+ FindGLIB caused internal CMake error in case GLIBCONFIG_INCLUDE_DIR is
+ not defined.
+
+ * Source/cmake/FindGLIB.cmake:
+
2016-02-25 Myles C. Maxfield <[email protected]>
[Win] [SVG -> OTF Converter] Support the SVG -> OTF Font Converter
Modified: trunk/Source/cmake/FindGLIB.cmake (197296 => 197297)
--- trunk/Source/cmake/FindGLIB.cmake 2016-02-28 19:14:26 UTC (rev 197296)
+++ trunk/Source/cmake/FindGLIB.cmake 2016-02-28 20:11:02 UTC (rev 197297)
@@ -69,43 +69,45 @@
set(GLIB_INCLUDE_DIRS ${GLIB_INCLUDE_DIR} ${GLIBCONFIG_INCLUDE_DIR})
-# Version detection
-file(READ "${GLIBCONFIG_INCLUDE_DIR}/glibconfig.h" GLIBCONFIG_H_CONTENTS)
-string(REGEX MATCH "#define GLIB_MAJOR_VERSION ([0-9]+)" _dummy "${GLIBCONFIG_H_CONTENTS}")
-set(GLIB_VERSION_MAJOR "${CMAKE_MATCH_1}")
-string(REGEX MATCH "#define GLIB_MINOR_VERSION ([0-9]+)" _dummy "${GLIBCONFIG_H_CONTENTS}")
-set(GLIB_VERSION_MINOR "${CMAKE_MATCH_1}")
-string(REGEX MATCH "#define GLIB_MICRO_VERSION ([0-9]+)" _dummy "${GLIBCONFIG_H_CONTENTS}")
-set(GLIB_VERSION_MICRO "${CMAKE_MATCH_1}")
-set(GLIB_VERSION "${GLIB_VERSION_MAJOR}.${GLIB_VERSION_MINOR}.${GLIB_VERSION_MICRO}")
+if (${GLIBCONFIG_INCLUDE_DIR})
+ # Version detection
+ file(READ "${GLIBCONFIG_INCLUDE_DIR}/glibconfig.h" GLIBCONFIG_H_CONTENTS)
+ string(REGEX MATCH "#define GLIB_MAJOR_VERSION ([0-9]+)" _dummy "${GLIBCONFIG_H_CONTENTS}")
+ set(GLIB_VERSION_MAJOR "${CMAKE_MATCH_1}")
+ string(REGEX MATCH "#define GLIB_MINOR_VERSION ([0-9]+)" _dummy "${GLIBCONFIG_H_CONTENTS}")
+ set(GLIB_VERSION_MINOR "${CMAKE_MATCH_1}")
+ string(REGEX MATCH "#define GLIB_MICRO_VERSION ([0-9]+)" _dummy "${GLIBCONFIG_H_CONTENTS}")
+ set(GLIB_VERSION_MICRO "${CMAKE_MATCH_1}")
+ set(GLIB_VERSION "${GLIB_VERSION_MAJOR}.${GLIB_VERSION_MINOR}.${GLIB_VERSION_MICRO}")
-# Additional Glib components. We only look for libraries, as not all of them
-# have corresponding headers and all headers are installed alongside the main
-# glib ones.
-foreach (_component ${GLIB_FIND_COMPONENTS})
- if (${_component} STREQUAL "gio")
- find_library(GLIB_GIO_LIBRARIES NAMES gio-2.0 HINTS ${_GLIB_LIBRARY_DIR})
- set(ADDITIONAL_REQUIRED_VARS ${ADDITIONAL_REQUIRED_VARS} GLIB_GIO_LIBRARIES)
- elseif (${_component} STREQUAL "gobject")
- find_library(GLIB_GOBJECT_LIBRARIES NAMES gobject-2.0 HINTS ${_GLIB_LIBRARY_DIR})
- set(ADDITIONAL_REQUIRED_VARS ${ADDITIONAL_REQUIRED_VARS} GLIB_GOBJECT_LIBRARIES)
- elseif (${_component} STREQUAL "gmodule")
- find_library(GLIB_GMODULE_LIBRARIES NAMES gmodule-2.0 HINTS ${_GLIB_LIBRARY_DIR})
- set(ADDITIONAL_REQUIRED_VARS ${ADDITIONAL_REQUIRED_VARS} GLIB_GMODULE_LIBRARIES)
- elseif (${_component} STREQUAL "gthread")
- find_library(GLIB_GTHREAD_LIBRARIES NAMES gthread-2.0 HINTS ${_GLIB_LIBRARY_DIR})
- set(ADDITIONAL_REQUIRED_VARS ${ADDITIONAL_REQUIRED_VARS} GLIB_GTHREAD_LIBRARIES)
- elseif (${_component} STREQUAL "gio-unix")
- # gio-unix is compiled as part of the gio library, but the include paths
- # are separate from the shared glib ones. Since this is currently only used
- # by WebKitGTK+ we don't go to extraordinary measures beyond pkg-config.
- pkg_check_modules(GIO_UNIX QUIET gio-unix-2.0)
- endif ()
-endforeach ()
+ # Additional Glib components. We only look for libraries, as not all of them
+ # have corresponding headers and all headers are installed alongside the main
+ # glib ones.
+ foreach (_component ${GLIB_FIND_COMPONENTS})
+ if (${_component} STREQUAL "gio")
+ find_library(GLIB_GIO_LIBRARIES NAMES gio-2.0 HINTS ${_GLIB_LIBRARY_DIR})
+ set(ADDITIONAL_REQUIRED_VARS ${ADDITIONAL_REQUIRED_VARS} GLIB_GIO_LIBRARIES)
+ elseif (${_component} STREQUAL "gobject")
+ find_library(GLIB_GOBJECT_LIBRARIES NAMES gobject-2.0 HINTS ${_GLIB_LIBRARY_DIR})
+ set(ADDITIONAL_REQUIRED_VARS ${ADDITIONAL_REQUIRED_VARS} GLIB_GOBJECT_LIBRARIES)
+ elseif (${_component} STREQUAL "gmodule")
+ find_library(GLIB_GMODULE_LIBRARIES NAMES gmodule-2.0 HINTS ${_GLIB_LIBRARY_DIR})
+ set(ADDITIONAL_REQUIRED_VARS ${ADDITIONAL_REQUIRED_VARS} GLIB_GMODULE_LIBRARIES)
+ elseif (${_component} STREQUAL "gthread")
+ find_library(GLIB_GTHREAD_LIBRARIES NAMES gthread-2.0 HINTS ${_GLIB_LIBRARY_DIR})
+ set(ADDITIONAL_REQUIRED_VARS ${ADDITIONAL_REQUIRED_VARS} GLIB_GTHREAD_LIBRARIES)
+ elseif (${_component} STREQUAL "gio-unix")
+ # gio-unix is compiled as part of the gio library, but the include paths
+ # are separate from the shared glib ones. Since this is currently only used
+ # by WebKitGTK+ we don't go to extraordinary measures beyond pkg-config.
+ pkg_check_modules(GIO_UNIX QUIET gio-unix-2.0)
+ endif ()
+ endforeach ()
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(GLIB REQUIRED_VARS GLIB_INCLUDE_DIRS GLIB_LIBRARIES ${ADDITIONAL_REQUIRED_VARS}
- VERSION_VAR GLIB_VERSION)
+ include(FindPackageHandleStandardArgs)
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(GLIB REQUIRED_VARS GLIB_INCLUDE_DIRS GLIB_LIBRARIES ${ADDITIONAL_REQUIRED_VARS}
+ VERSION_VAR GLIB_VERSION)
+endif ()
mark_as_advanced(
GLIBCONFIG_INCLUDE_DIR
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes