Title: [168721] releases/WebKitGTK/webkit-2.4/Source/PlatformGTK.cmake
- Revision
- 168721
- Author
- [email protected]
- Date
- 2014-05-13 12:31:52 -0700 (Tue, 13 May 2014)
Log Message
Merge 165386 - [GTK][CMAKE] gtk-doc HTML documentation is generated by default when building with CMake
https://bugs.webkit.org/show_bug.cgi?id=130016
Reviewed by Carlos Garcia Campos.
* Source/PlatformGTK.cmake: Add two gtkdoc targets, one which builds HTML and one which
doesn't. Add the non-HTML version to the default target, but not the HTML version. The
HTML version will still run when building the distribution tarball.
Conflicts:
ChangeLog
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.4/Source/PlatformGTK.cmake (168720 => 168721)
--- releases/WebKitGTK/webkit-2.4/Source/PlatformGTK.cmake 2014-05-13 19:31:42 UTC (rev 168720)
+++ releases/WebKitGTK/webkit-2.4/Source/PlatformGTK.cmake 2014-05-13 19:31:52 UTC (rev 168721)
@@ -29,26 +29,26 @@
)
endif ()
-add_custom_command(
- OUTPUT "${CMAKE_BINARY_DIR}/docs-build.stamp"
- DEPENDS ${DocumentationDependencies}
- COMMAND CC="${CMAKE_C_COMPILER}" ${CMAKE_SOURCE_DIR}/Tools/gtk/generate-gtkdoc
- COMMAND touch docs-build.stamp
- WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
+macro(ADD_GTKDOC_GENERATOR _stamp_name _extra_args)
+ add_custom_command(
+ OUTPUT "${CMAKE_BINARY_DIR}/${_stamp_name}"
+ DEPENDS ${DocumentationDependencies}
+ COMMAND CC="${CMAKE_C_COMPILER}" ${CMAKE_SOURCE_DIR}/Tools/gtk/generate-gtkdoc ${_extra_args}
+ COMMAND touch ${_stamp_name}
+ WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
+ )
+endmacro()
+
+add_gtkdoc_generator("docs-build-no-html.stamp" "--skip-html")
+add_custom_target(gtkdoc-no-html ALL
+ DEPENDS "${CMAKE_BINARY_DIR}/docs-build-no-html.stamp"
)
-add_custom_target(fake-docs-target ALL
+add_gtkdoc_generator("docs-build.stamp" "")
+add_custom_target(gtkdoc
DEPENDS "${CMAKE_BINARY_DIR}/docs-build.stamp"
)
-if (ENABLE_WEBKIT)
- add_dependencies(fake-docs-target WebKit)
-endif ()
-
-if (ENABLE_WEBKIT2)
- add_dependencies(fake-docs-target WebKit2)
-endif ()
-
add_custom_target(check
COMMAND ${TOOLS_DIR}/Scripts/run-gtk-tests
COMMAND ${TOOLS_DIR}/gtk/check-for-webkitdom-api-breaks
@@ -61,6 +61,7 @@
DEPENDS ${TOOLS_DIR}/gtk/manifest.txt
DEPENDS WebKit
DEPENDS WebKit2
+ DEPENDS gtkdoc
COMMAND ${TOOLS_DIR}/gtk/make-dist.py
--source-dir=${CMAKE_SOURCE_DIR}
--build-dir=${CMAKE_BINARY_DIR}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
