Compare commits

..

No commits in common. "924617e1ced9fafd7cf723e104545d4852674da9" and "bc1dd64fdf84f6b9760fd8d69130dc5d964647bd" have entirely different histories.

View File

@ -4,8 +4,7 @@ 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 "For developers only--work without installing" OFF) option (OPTION_NOINSTALL "Only for developers; 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
@ -175,8 +174,6 @@ 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})
@ -252,7 +249,7 @@ if (BUILD_TESTING)
endif (BUILD_TESTING) endif (BUILD_TESTING)
# Generate documentation # Generate documentation
if (OPTION_GTKDOC AND GTKDOC_FOUND) if (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