Compare commits

...

2 Commits

Author SHA1 Message Date
924617e1ce
Silence some GLib deprecation warnings
Using the GLib version from the GTK+ 3.8.2 bundle.
2021-10-24 16:45:53 +02:00
67acddb26d
Disable the broken gtk-doc rule by default
Unlikely to be used by anyone, especially since it cannot produce
anything useful anymore.
2021-10-24 16:43:55 +02:00

View File

@ -4,7 +4,8 @@ project (logdiag VERSION 0.2.1 LANGUAGES C)
# Options # Options
option (OPTION_USE_VERA "Use vera++ for source code style checks" OFF) option (OPTION_USE_VERA "Use vera++ for source code style checks" OFF)
option (OPTION_NOINSTALL "Only for developers; work without installing" OFF) option (OPTION_NOINSTALL "For developers only--work without installing" OFF)
option (OPTION_GTKDOC "For developers only--enable use of gtk-doc" OFF)
option (BUILD_TESTING "Build tests" OFF) option (BUILD_TESTING "Build tests" OFF)
# Project information # Project information
@ -174,6 +175,8 @@ if (WIN32)
endif (WIN32) endif (WIN32)
# Generate a configure file # Generate a configure file
add_definitions (-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_36)
add_definitions (-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_36)
configure_file (${PROJECT_SOURCE_DIR}/config.h.in configure_file (${PROJECT_SOURCE_DIR}/config.h.in
${PROJECT_BINARY_DIR}/config.h) ${PROJECT_BINARY_DIR}/config.h)
include_directories (${PROJECT_BINARY_DIR}) include_directories (${PROJECT_BINARY_DIR})
@ -249,7 +252,7 @@ if (BUILD_TESTING)
endif (BUILD_TESTING) endif (BUILD_TESTING)
# Generate documentation # Generate documentation
if (GTKDOC_FOUND) if (OPTION_GTKDOC AND GTKDOC_FOUND)
# Extracted LDFLAGS didn't contain -l in CMake 3.21.3 and gtk-doc 1.33.2, # Extracted LDFLAGS didn't contain -l in CMake 3.21.3 and gtk-doc 1.33.2,
# pass them explicitly and work around insanity; CMake still exits with # pass them explicitly and work around insanity; CMake still exits with
# an error and gtk-doc produces empty HTML documentation # an error and gtk-doc produces empty HTML documentation