some more work to getting gtkdoc to work under cmake
--- a/gflib/CMakeLists.txt Sun Mar 21 23:34:28 2010 -0500
+++ b/gflib/CMakeLists.txt Sat Apr 03 20:45:50 2010 -0500
@@ -5,7 +5,12 @@
###############################################################################
cmake_minimum_required(VERSION 2.6)
+set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules) ###############################################################################
@@ -50,29 +55,5 @@
-###############################################################################
-###############################################################################
-pkg_check_modules(GLIB REQUIRED
-# we need glib-genmarshal and glib-mkenums
-find_program(GLIB_GENMARSHAL NAMES glib-genmarshal DOC "glib-genmarshal executable")
-mark_as_advanced(GLIB_GENMARSHAL)
-find_program(GLIB_MKENUMS NAMES glib-mkenums DOC "glib-mkenums executable")
-mark_as_advanced(GLIB_MKENUMS)
-# gmodule is in a separate variable so that our helper apps don't get linked to
-pkg_check_modules(GMODULE REQUIRED
configure_file(gflib.pc.in gflib.pc @ONLY)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/gflib/cmake/Modules/FindGlib.cmake Sat Apr 03 20:45:50 2010 -0500
@@ -0,0 +1,34 @@
+pkg_check_modules(GLIB REQUIRED +# we need glib-genmarshal and glib-mkenums +find_program(GLIB_GENMARSHAL + DOC "glib-genmarshal executable" +mark_as_advanced(GLIB_GENMARSHAL) +find_program(GLIB_MKENUMS + DOC "glib-mkenums executable" +mark_as_advanced(GLIB_MKENUMS) +# gmodule is in a separate variable so that our helper apps don't get linked to +pkg_check_modules(GMODULE REQUIRED +# now we need to find gtester + DOC "gtester executable" +add_executable(${GTESTER} IMPORTED) +mark_as_advanced(GTESTER) --- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/gflib/cmake/Modules/gtk-doc.cmake Sat Apr 03 20:45:50 2010 -0500
@@ -0,0 +1,143 @@
+macro(add_gtk_doc_book _module _target) + get_target_property(_sources ${_target} SOURCES) + message("sources: ${_sources}") + get_target_property(_location ${_target} LOCATION) + message("location: ${_location}") + OUTPUT scan-build.stamp + COMMAND ${GTKDOC_SCAN} --module=${_module} --source-dir=${_source_dir} +endmacro(add_gtk_doc_book) +############################################################################### +############################################################################### +FIND_PROGRAM(GTKDOC_CHECK + DOC "GTK Doc - documentation unit tests" +FIND_PROGRAM(GTKDOC_DEPSCAN + DOC "GTK Doc - dependency scanner" +FIND_PROGRAM(GTKDOC_FIXXREF + DOC "GTK Doc - fix cross references in html files" +FIND_PROGRAM(GTKDOC_MKDB + DOC "GTK Doc - generate docbook files" +FIND_PROGRAM(GTKDOC_MKHTML + DOC "GTK Doc - generate html files" +FIND_PROGRAM(GTKDOC_MKMAN + DOC "GTK Doc - generate man pages" +FIND_PROGRAM(GTKDOC_MKPDF + DOC "GTK Doc - generation pdf files" +FIND_PROGRAM(GTKDOC_MKTMPL + DOC "GTK Doc - generate documentation templates" +FIND_PROGRAM(GTKDOC_REBASE + DOC "GTK Doc - rewrite the base url of html files" +FIND_PROGRAM(GTKDOC_SCAN + DOC "GTK Doc - scan header files for public symbols" +FIND_PROGRAM(GTKDOC_SCANGOBJ + DOC "GTK Doc - introspect g-objects" +FIND_PROGRAM(GTKDOC_SCANOBJ + DOC "GTK Doc - introspect gtk-objects" --- a/gflib/doc/CMakeLists.txt Sun Mar 21 23:34:28 2010 -0500
+++ b/gflib/doc/CMakeLists.txt Sat Apr 03 20:45:50 2010 -0500
@@ -3,3 +3,5 @@
configure_file(gflib-genheader.1.in gflib-genheader.1)
configure_file(gflib-query-plugins.1.in gflib-query-plugins.1)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/gflib/doc/gflib/CMakeLists.txt Sat Apr 03 20:45:50 2010 -0500
@@ -0,0 +1,2 @@
+add_gtk_doc_book(gflib gflib) --- a/gflib/tests/CMakeLists.txt Sun Mar 21 23:34:28 2010 -0500
+++ b/gflib/tests/CMakeLists.txt Sat Apr 03 20:45:50 2010 -0500
@@ -0,0 +1,15 @@
+TARGET_LINK_LIBRARIES(testlog +#ADD_TEST(GTESTER_TESTS gtester --verbose ${TESTS}) +#ADD_DEPENDENCIES(GTESTER_TESTS ${TESTS})