Title: [197350] trunk
- Revision
- 197350
- Author
- [email protected]
- Date
- 2016-02-29 06:59:39 -0800 (Mon, 29 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-29
Reviewed by Michael Catanzaro.
FindGLIB caused internal CMake error in case glibconfig.h is not
found.
* Source/cmake/FindGLIB.cmake:
Modified Paths
Diff
Modified: trunk/ChangeLog (197349 => 197350)
--- trunk/ChangeLog 2016-02-29 13:32:24 UTC (rev 197349)
+++ trunk/ChangeLog 2016-02-29 14:59:39 UTC (rev 197350)
@@ -1,3 +1,15 @@
+2016-02-29 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.h is not
+ found.
+
+ * Source/cmake/FindGLIB.cmake:
+
2016-02-29 Commit Queue <[email protected]>
Unreviewed, rolling out r197297.
Modified: trunk/Source/cmake/FindGLIB.cmake (197349 => 197350)
--- trunk/Source/cmake/FindGLIB.cmake 2016-02-29 13:32:24 UTC (rev 197349)
+++ trunk/Source/cmake/FindGLIB.cmake 2016-02-29 14:59:39 UTC (rev 197350)
@@ -70,14 +70,16 @@
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 (EXISTS "${GLIBCONFIG_INCLUDE_DIR}/glibconfig.h")
+ 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}")
+endif ()
# Additional Glib components. We only look for libraries, as not all of them
# have corresponding headers and all headers are installed alongside the main
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes