buildsystem - full cmake-lint coverage

5 files changed, 128 insertions, 100 deletions

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 10311ce7..4dc2a89c 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -26,7 +26,7 @@ repos:
   rev: v0.6.13
   hooks:
   - id: cmake-lint
-    exclude: cmake/Toolchain-*|config.h.cmake
+    exclude: (cmake/Toolchain-|.h.cmake|/Doxyfile.cmake)
 - repo: https://github.com/markdownlint/markdownlint
   rev: v0.11.0
   hooks:
diff --git a/cmake/modules/FindBerkeleyDB.cmake b/cmake/modules/FindBerkeleyDB.cmake
index 8a818465..63ffe9dc 100644
--- a/cmake/modules/FindBerkeleyDB.cmake
+++ b/cmake/modules/FindBerkeleyDB.cmake
@@ -26,64 +26,63 @@ endif()
 
 # Allow user to pass a path instead of guessing
 if(BerkeleyDB_ROOT_DIR)
-	set(_BERKELEYDB_PATHS "${BerkeleyDB_ROOT_DIR}")
+  set(_BERKELEYDB_PATHS "${BerkeleyDB_ROOT_DIR}")
 elseif(CMAKE_SYSTEM_NAME MATCHES ".*[wW]indows.*")
-	# MATCHES is used to work on any devies with windows in the name
-	# Shameless copy-paste from FindOpenSSL.cmake v3.8
-	file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _programfiles)
-	list(APPEND _BERKELEYDB_PATHS "${_programfiles}")
-
-	# There's actually production release and version numbers in the file path.
-	# For example, if they're on v6.2.32: C:/Program Files/Oracle/Berkeley DB 12cR1 6.2.32/
-	# But this still works to find it, so I'm guessing it can accept partial path matches.
-
-	foreach(_TARGET_BERKELEYDB_PATH "Oracle/Berkeley DB" "Berkeley DB")
-		list(APPEND _BERKELEYDB_PATHS
-			"${_programfiles}/${_TARGET_BERKELEYDB_PATH}"
-			"C:/Program Files (x86)/${_TARGET_BERKELEYDB_PATH}"
-			"C:/Program Files/${_TARGET_BERKELEYDB_PATH}"
-			"C:/${_TARGET_BERKELEYDB_PATH}"
-		)
-	endforeach()
+  # MATCHES is used to work on any devies with windows in the name
+  # Shameless copy-paste from FindOpenSSL.cmake v3.8
+  file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _programfiles)
+  list(APPEND _BERKELEYDB_PATHS "${_programfiles}")
+
+  # There's actually production release and version numbers in the file path.
+  # For example, if they're on v6.2.32: C:/Program Files/Oracle/Berkeley DB 12cR1 6.2.32/
+  # But this still works to find it, so I'm guessing it can accept partial path matches.
+
+  foreach(_target_berkeleydb_path "Oracle/Berkeley DB" "Berkeley DB")
+    list(APPEND _BERKELEYDB_PATHS
+      "${_programfiles}/${_target_berkeleydb_path}"
+      "C:/Program Files (x86)/${_target_berkeleydb_path}"
+      "C:/Program Files/${_target_berkeleydb_path}"
+      "C:/${_target_berkeleydb_path}"
+    )
+  endforeach()
 else()
-	# Paths for anything other than Windows
-	# Cellar/berkeley-db is for macOS from homebrew installation
-	list(APPEND _BERKELEYDB_PATHS
-		"/usr"
-		"/usr/local"
-		"/usr/local/Cellar/berkeley-db"
-		"/opt"
-		"/opt/local"
-	)
+  # Paths for anything other than Windows
+  # Cellar/berkeley-db is for macOS from homebrew installation
+  list(APPEND _BERKELEYDB_PATHS
+    "/usr"
+    "/usr/local"
+    "/usr/local/Cellar/berkeley-db"
+    "/opt"
+    "/opt/local"
+  )
 endif()
 
 # Find includes path
 find_path(BerkeleyDB_INCLUDE_DIRS
-	NAMES "db.h"
-	HINTS ${_BERKELEYDB_PATHS}
-	PATH_SUFFIXES "include" "includes"
+  NAMES "db.h"
+  HINTS ${_BERKELEYDB_PATHS}
+  PATH_SUFFIXES "include" "includes"
 )
 
 # Checks if the version file exists, save the version file to a var, and fail if there's no version file
 if(BerkeleyDB_INCLUDE_DIRS)
-	# Read the version file db.h into a variable
-	file(READ "${BerkeleyDB_INCLUDE_DIRS}/db.h" _BERKELEYDB_DB_HEADER)
-	# Parse the DB version into variables to be used in the lib names
-	string(REGEX REPLACE ".*DB_VERSION_MAJOR	([0-9]+).*" "\\1" BerkeleyDB_VERSION_MAJOR "${_BERKELEYDB_DB_HEADER}")
-	string(REGEX REPLACE ".*DB_VERSION_MINOR	([0-9]+).*" "\\1" BerkeleyDB_VERSION_MINOR "${_BERKELEYDB_DB_HEADER}")
-	# Patch version example on non-crypto installs: x.x.xNC
-	string(REGEX REPLACE ".*DB_VERSION_PATCH	([0-9]+(NC)?).*" "\\1" BerkeleyDB_VERSION_PATCH "${_BERKELEYDB_DB_HEADER}")
+  # Read the version file db.h into a variable
+  file(READ "${BerkeleyDB_INCLUDE_DIRS}/db.h" _BERKELEYDB_DB_HEADER)
+  # Parse the DB version into variables to be used in the lib names
+  string(REGEX REPLACE ".*DB_VERSION_MAJOR	([0-9]+).*" "\\1" BerkeleyDB_VERSION_MAJOR "${_BERKELEYDB_DB_HEADER}")
+  string(REGEX REPLACE ".*DB_VERSION_MINOR	([0-9]+).*" "\\1" BerkeleyDB_VERSION_MINOR "${_BERKELEYDB_DB_HEADER}")
+  # Patch version example on non-crypto installs: x.x.xNC
+  string(REGEX REPLACE ".*DB_VERSION_PATCH	([0-9]+(NC)?).*" "\\1" BerkeleyDB_VERSION_PATCH "${_BERKELEYDB_DB_HEADER}")
 else()
-	if(BerkeleyDB_FIND_REQUIRED)
-		# If the find_package(BerkeleyDB REQUIRED) was used, fail since we couldn't find the header
-		message(FATAL_ERROR "Failed to find Berkeley DB's header file \"db.h\"! Try setting \"BerkeleyDB_ROOT_DIR\" when initiating Cmake.")
-	#elseif(NOT BerkeleyDB_FIND_QUIETLY)
-	#	message(WARNING "Failed to find Berkeley DB's header file \"db.h\"! Try setting \"BerkeleyDB_ROOT_DIR\" when initiating Cmake.")
-	endif()
-	# Set some garbage values to the versions since we didn't find a file to read
-	set(BerkeleyDB_VERSION_MAJOR "0")
-	set(BerkeleyDB_VERSION_MINOR "0")
-	set(BerkeleyDB_VERSION_PATCH "0")
+  if(BerkeleyDB_FIND_REQUIRED)
+    # If the find_package(BerkeleyDB REQUIRED) was used, fail since we couldn't find the header
+    message(FATAL_ERROR
+      "Failed to find Berkeley DB's header file \"db.h\"! Try setting \"BerkeleyDB_ROOT_DIR\" when initiating Cmake.")
+  endif()
+  # Set some garbage values to the versions since we didn't find a file to read
+  set(BerkeleyDB_VERSION_MAJOR "0")
+  set(BerkeleyDB_VERSION_MINOR "0")
+  set(BerkeleyDB_VERSION_PATCH "0")
 endif()
 
 # The actual returned/output version variable (the others can be used if needed)
@@ -91,33 +90,34 @@ set(BerkeleyDB_VERSION "${BerkeleyDB_VERSION_MAJOR}.${BerkeleyDB_VERSION_MINOR}.
 
 set(BerkeleyDB_LIBRARIES "")
 # Finds the target library for berkeley db, since they all follow the same naming conventions
-macro(findpackage_berkeleydb_get_lib _BERKELEYDB_OUTPUT_VARNAME _TARGET_BERKELEYDB_LIB)
-	# Different systems sometimes have a version in the lib name...
-	# and some have a dash or underscore before the versions.
-	# CMake recommends to put unversioned names before versioned names
-	find_library(${_BERKELEYDB_OUTPUT_VARNAME}
-		NAMES
-		"${_TARGET_BERKELEYDB_LIB}"
-		"lib${_TARGET_BERKELEYDB_LIB}"
-		"lib${_TARGET_BERKELEYDB_LIB}${BerkeleyDB_VERSION_MAJOR}.${BerkeleyDB_VERSION_MINOR}"
-		"lib${_TARGET_BERKELEYDB_LIB}-${BerkeleyDB_VERSION_MAJOR}.${BerkeleyDB_VERSION_MINOR}"
-		"lib${_TARGET_BERKELEYDB_LIB}_${BerkeleyDB_VERSION_MAJOR}.${BerkeleyDB_VERSION_MINOR}"
-		"lib${_TARGET_BERKELEYDB_LIB}${BerkeleyDB_VERSION_MAJOR}${BerkeleyDB_VERSION_MINOR}"
-		"lib${_TARGET_BERKELEYDB_LIB}-${BerkeleyDB_VERSION_MAJOR}${BerkeleyDB_VERSION_MINOR}"
-		"lib${_TARGET_BERKELEYDB_LIB}_${BerkeleyDB_VERSION_MAJOR}${BerkeleyDB_VERSION_MINOR}"
-		"lib${_TARGET_BERKELEYDB_LIB}${BerkeleyDB_VERSION_MAJOR}"
-		"lib${_TARGET_BERKELEYDB_LIB}-${BerkeleyDB_VERSION_MAJOR}"
-		"lib${_TARGET_BERKELEYDB_LIB}_${BerkeleyDB_VERSION_MAJOR}"
-		HINTS ${_BERKELEYDB_PATHS}
-		PATH_SUFFIXES "lib" "lib64" "libs" "libs64"
-	)
-	# If the library was found, add it to our list of libraries
-	if(${_BERKELEYDB_OUTPUT_VARNAME})
-		# If found, append to our libraries variable
-		# The ${{}} is because the first expands to target the real variable, the second expands the variable's contents...
-		# and the real variable's contents is the path to the lib. Thus, it appends the path of the lib to BerkeleyDB_LIBRARIES.
-		list(APPEND BerkeleyDB_LIBRARIES "${${_BERKELEYDB_OUTPUT_VARNAME}}")
-	endif()
+macro(findpackage_berkeleydb_get_lib _berkeleydb_output_varname _target_berkeleydb_lib)
+  # Different systems sometimes have a version in the lib name...
+  # and some have a dash or underscore before the versions.
+  # CMake recommends to put unversioned names before versioned names
+  find_library(${_berkeleydb_output_varname}
+    NAMES
+    "${_target_berkeleydb_lib}"
+    "lib${_target_berkeleydb_lib}"
+    "lib${_target_berkeleydb_lib}${BerkeleyDB_VERSION_MAJOR}.${BerkeleyDB_VERSION_MINOR}"
+    "lib${_target_berkeleydb_lib}-${BerkeleyDB_VERSION_MAJOR}.${BerkeleyDB_VERSION_MINOR}"
+    "lib${_target_berkeleydb_lib}_${BerkeleyDB_VERSION_MAJOR}.${BerkeleyDB_VERSION_MINOR}"
+    "lib${_target_berkeleydb_lib}${BerkeleyDB_VERSION_MAJOR}${BerkeleyDB_VERSION_MINOR}"
+    "lib${_target_berkeleydb_lib}-${BerkeleyDB_VERSION_MAJOR}${BerkeleyDB_VERSION_MINOR}"
+    "lib${_target_berkeleydb_lib}_${BerkeleyDB_VERSION_MAJOR}${BerkeleyDB_VERSION_MINOR}"
+    "lib${_target_berkeleydb_lib}${BerkeleyDB_VERSION_MAJOR}"
+    "lib${_target_berkeleydb_lib}-${BerkeleyDB_VERSION_MAJOR}"
+    "lib${_target_berkeleydb_lib}_${BerkeleyDB_VERSION_MAJOR}"
+    HINTS ${_BERKELEYDB_PATHS}
+    PATH_SUFFIXES "lib" "lib64" "libs" "libs64"
+  )
+  # If the library was found, add it to our list of libraries
+  if(${_berkeleydb_output_varname})
+    # If found, append to our libraries variable
+    # The ${{}} is because the first expands to target the real variable, the second expands
+    # the variable's contents... and the real variable's contents is the path to the lib. Thus,
+    # it appends the path of the lib to BerkeleyDB_LIBRARIES.
+    list(APPEND BerkeleyDB_LIBRARIES "${${_berkeleydb_output_varname}}")
+  endif()
 endmacro()
 
 # Find and set the paths of the specific library to the variable
@@ -132,37 +132,37 @@ findpackage_berkeleydb_get_lib(BerkeleyDB_Stl_LIBRARY "db_stl")
 include(FindPackageHandleStandardArgs)
 # Fails if required vars aren't found, or if the version doesn't meet specifications.
 find_package_handle_standard_args(BerkeleyDB
-	FOUND_VAR BerkeleyDB_FOUND
-	REQUIRED_VARS
-		BerkeleyDB_INCLUDE_DIRS
-		BerkeleyDB_LIBRARY
-	VERSION_VAR BerkeleyDB_VERSION
+  FOUND_VAR BerkeleyDB_FOUND
+  REQUIRED_VARS
+    BerkeleyDB_INCLUDE_DIRS
+    BerkeleyDB_LIBRARY
+  VERSION_VAR BerkeleyDB_VERSION
 )
 
 # Create an imported lib for easy linking by external projects
 if(BerkeleyDB_FOUND AND BerkeleyDB_LIBRARIES AND NOT TARGET Oracle::BerkeleyDB)
-	add_library(Oracle::BerkeleyDB UNKNOWN IMPORTED)
-	set_target_properties(Oracle::BerkeleyDB PROPERTIES
-		INTERFACE_INCLUDE_DIRECTORIES "${BerkeleyDB_INCLUDE_DIRS}"
-		IMPORTED_LOCATION "${BerkeleyDB_LIBRARY}"
-		INTERFACE_LINK_LIBRARIES "${BerkeleyDB_LIBRARIES}"
-	)
+  add_library(Oracle::BerkeleyDB UNKNOWN IMPORTED)
+  set_target_properties(Oracle::BerkeleyDB PROPERTIES
+    INTERFACE_INCLUDE_DIRECTORIES "${BerkeleyDB_INCLUDE_DIRS}"
+    IMPORTED_LOCATION "${BerkeleyDB_LIBRARY}"
+    INTERFACE_LINK_LIBRARIES "${BerkeleyDB_LIBRARIES}"
+  )
 endif()
 
 # Only show the includes path and libraries in the GUI if they click "advanced".
 # Does nothing when using the CLI
 mark_as_advanced(FORCE
-	BerkeleyDB_INCLUDE_DIRS
-	BerkeleyDB_LIBRARIES
-	BerkeleyDB_LIBRARY
-	BerkeleyDB_Cxx_LIBRARY
-	BerkeleyDB_Sql_LIBRARY
-	BerkeleyDB_Stl_LIBRARY
+  BerkeleyDB_INCLUDE_DIRS
+  BerkeleyDB_LIBRARIES
+  BerkeleyDB_LIBRARY
+  BerkeleyDB_Cxx_LIBRARY
+  BerkeleyDB_Sql_LIBRARY
+  BerkeleyDB_Stl_LIBRARY
 )
 
 include(FindPackageMessage)
 # A message that tells the user what includes/libs were found, and obeys the QUIET command.
 find_package_message(BerkeleyDB
-	"Found BerkeleyDB libraries: ${BerkeleyDB_LIBRARIES}"
-	"[${BerkeleyDB_LIBRARIES}[${BerkeleyDB_INCLUDE_DIRS}]]"
+  "Found BerkeleyDB libraries: ${BerkeleyDB_LIBRARIES}"
+  "[${BerkeleyDB_LIBRARIES}[${BerkeleyDB_INCLUDE_DIRS}]]"
 )
diff --git a/src/libical-glib/CMakeLists.txt b/src/libical-glib/CMakeLists.txt
index 2c14a560..967b4b98 100644
--- a/src/libical-glib/CMakeLists.txt
+++ b/src/libical-glib/CMakeLists.txt
@@ -92,9 +92,14 @@ else()
 endif()
 
 add_custom_command (
-  OUTPUT ${LIBICAL_GLIB_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/libical-glib-private.h ${CMAKE_CURRENT_BINARY_DIR}/i-cal-forward-declarations.h
-  COMMAND ${ical-glib-src-generator_EXE} "${CMAKE_CURRENT_SOURCE_DIR}/tools" "${CMAKE_CURRENT_SOURCE_DIR}/api"
+  OUTPUT
+    ${LIBICAL_GLIB_SOURCES}
+    ${CMAKE_CURRENT_BINARY_DIR}/libical-glib-private.h
+    ${CMAKE_CURRENT_BINARY_DIR}/i-cal-forward-declarations.h
+  COMMAND
+    ${ical-glib-src-generator_EXE} "${CMAKE_CURRENT_SOURCE_DIR}/tools" "${CMAKE_CURRENT_SOURCE_DIR}/api"
   DEPENDS ${ical-glib-src-generator_EXE} ${xml_files}
+  COMMENT "Generate libical-glib headers"
 )
 
 configure_file(
@@ -131,7 +136,11 @@ target_link_libraries(ical-glib PRIVATE ical ${GLIB_LIBRARIES})
 if(NOT SHARED_ONLY AND NOT STATIC_ONLY)
   add_library(ical-glib-static STATIC ${LIBICAL_GLIB_SOURCES})
   add_dependencies(ical-glib-static ical-header)
-  target_compile_options(ical-glib-static PUBLIC ${GLIB_CFLAGS} -DG_LOG_DOMAIN="libical-glib" -DLIBICAL_GLIB_COMPILATION)
+  target_compile_options(ical-glib-static
+    PUBLIC ${GLIB_CFLAGS}
+    -DG_LOG_DOMAIN="libical-glib"
+    -DLIBICAL_GLIB_COMPILATION
+  )
   target_link_libraries(ical-glib-static ${GLIB_LIBRARIES})
 endif()
 
@@ -179,7 +188,14 @@ if(HAVE_INTROSPECTION)
   set(ICalGLib_${LIB_VERSION}_gir_VERSION ${LIBICAL_GLIB_GIR_VERSION_STRING})
   set(ICalGLib_${LIB_VERSION}_gir_LIBRARY "ICalGLib")
   set(ICalGLib_${LIB_VERSION}_gir_INCLUDES GObject-2.0 GLib-2.0)
-  set(ICalGLib_${LIB_VERSION}_gir_CFLAGS ${GLIB_CFLAGS} -DLIBICAL_GLIB_COMPILATION -I${CMAKE_CURRENT_BINARY_DIR} -I${CMAKE_CURRENT_SOURCE_DIR} -I${CMAKE_BINARY_DIR}/src/libical -I${CMAKE_SOURCE_DIR}/src/libical -I${CMAKE_BINARY_DIR}/src/libical-glib)
+  set(ICalGLib_${LIB_VERSION}_gir_CFLAGS ${GLIB_CFLAGS}
+    -DLIBICAL_GLIB_COMPILATION
+    -I${CMAKE_CURRENT_BINARY_DIR}
+    -I${CMAKE_CURRENT_SOURCE_DIR}
+    -I${CMAKE_BINARY_DIR}/src/libical
+    -I${CMAKE_SOURCE_DIR}/src/libical
+    -I${CMAKE_BINARY_DIR}/src/libical-glib
+  )
   set(ICalGLib_${LIB_VERSION}_gir_LIBS ical-glib)
   set(ICalGLib_${LIB_VERSION}_gir_FILES ${LIBICAL_GLIB_GIR_SOURCES})
 
@@ -189,7 +205,7 @@ if(HAVE_INTROSPECTION)
 endif()
 
 if(ICAL_GLIB_VAPI)
-  add_custom_target(vala ALL)
+  add_custom_target(vala ALL COMMENT "Target to run vala")
   set(gir_fullname ${CMAKE_BINARY_DIR}/src/libical-glib/ICalGLib-${LIBICAL_GLIB_GIR_VERSION_STRING}.gir)
   set(metadata_fullname ${CMAKE_CURRENT_BINARY_DIR}/ICalGLib-${LIBICAL_GLIB_GIR_VERSION_STRING}.metadata)
   set(vapi_file ${CMAKE_CURRENT_BINARY_DIR}/libical-glib.vapi)
@@ -213,9 +229,10 @@ if(ICAL_GLIB_VAPI)
     DEPENDS
       ${gir_fullname}
       ${metadata_fullname}
+    COMMENT "Run the tool to generate the Vala API"
   )
 
-  add_custom_target(valafile DEPENDS ${vapi_file})
+  add_custom_target(valafile DEPENDS ${vapi_file} COMMENT "Target to run valafile")
 
   add_dependencies(vala valafile)
 
diff --git a/src/libical/CMakeLists.txt b/src/libical/CMakeLists.txt
index 5852e13f..f53413a1 100644
--- a/src/libical/CMakeLists.txt
+++ b/src/libical/CMakeLists.txt
@@ -53,6 +53,7 @@ add_custom_command(
   DEPENDS
     ${PROPERTYDEPS}
     ${CMAKE_SOURCE_DIR}/src/libical/icalderivedproperty.h.in
+  COMMENT "Generate icalderivedproperty.h"
 )
 list(APPEND BUILT_HEADERS ${CMAKE_BINARY_DIR}/src/libical/icalderivedproperty.h)
 
@@ -68,6 +69,7 @@ add_custom_command(
   DEPENDS
     ${PROPERTYDEPS}
     ${CMAKE_SOURCE_DIR}/src/libical/icalderivedproperty.c.in
+  COMMENT "Generate icalderivedproperty.c"
 )
 list(APPEND BUILT_SOURCES ${CMAKE_BINARY_DIR}/src/libical/icalderivedproperty.c)
 
@@ -87,6 +89,7 @@ add_custom_command(
   DEPENDS
     ${PARAMETERDEPS}
     ${CMAKE_SOURCE_DIR}/src/libical/icalderivedparameter.h.in
+  COMMENT "Generate icalderivedparameter.h"
 )
 list(APPEND BUILT_HEADERS ${CMAKE_BINARY_DIR}/src/libical/icalderivedparameter.h)
 
@@ -101,6 +104,7 @@ add_custom_command(
   DEPENDS
     ${PARAMETERDEPS}
     ${CMAKE_SOURCE_DIR}/src/libical/icalderivedparameter.c.in
+  COMMENT "Generate icalderivedparameter.c"
 )
 list(APPEND BUILT_SOURCES ${CMAKE_BINARY_DIR}/src/libical/icalderivedparameter.c)
 
@@ -120,6 +124,7 @@ add_custom_command(
   DEPENDS
     ${RESTRICTIONDEPS}
     ${CMAKE_SOURCE_DIR}/src/libical/icalrestriction.c.in
+  COMMENT "Generate icalrestriction.c"
 )
 list(APPEND BUILT_SOURCES ${CMAKE_BINARY_DIR}/src/libical/icalrestriction.c)
 
@@ -139,6 +144,7 @@ add_custom_command(
   DEPENDS
     ${VALUEDEPS}
     ${CMAKE_SOURCE_DIR}/src/libical/icalderivedvalue.h.in
+  COMMENT "Generate icalderivedvalue.h"
 )
 list(APPEND BUILT_HEADERS ${CMAKE_BINARY_DIR}/src/libical/icalderivedvalue.h)
 
@@ -153,6 +159,7 @@ add_custom_command(
   DEPENDS
     ${VALUEDEPS}
     ${CMAKE_SOURCE_DIR}/src/libical/icalderivedvalue.c.in
+  COMMENT "Generate icalderivedvalue.c"
 )
 list(APPEND BUILT_SOURCES ${CMAKE_BINARY_DIR}/src/libical/icalderivedvalue.c)
 
@@ -167,6 +174,7 @@ endif()
 add_custom_target(
   ical-header ALL
   DEPENDS ${CMAKE_BINARY_DIR}/src/libical/ical.h
+  COMMENT "Target to generate the aggregate ical.h header"
 )
 
 # GObject Introspection
@@ -268,6 +276,7 @@ add_custom_command(
       -DICAL_FILE_H_FILE:FILEPATH=${CMAKE_BINARY_DIR}/src/libical/ical.h
       -P ${CMAKE_CURRENT_SOURCE_DIR}/ical_file.cmake
   DEPENDS ${ical_LIB_SRCS} ${CMAKE_CURRENT_SOURCE_DIR}/ical_file.cmake
+  COMMENT "Generate the aggregate ical.h header"
 )
 
 add_library(ical ${LIBRARY_TYPE} ${ical_LIB_SRCS})
diff --git a/src/libicalss/CMakeLists.txt b/src/libicalss/CMakeLists.txt
index bbc0092e..1982ddc8 100644
--- a/src/libicalss/CMakeLists.txt
+++ b/src/libicalss/CMakeLists.txt
@@ -25,6 +25,7 @@ endif()
 add_custom_target(
   icalss-header ALL
   DEPENDS ${CMAKE_BINARY_DIR}/src/libicalss/icalss.h
+  COMMENT "Target to generate the aggregate libicalss header"
 )
 
 ########### next target ###############
@@ -78,6 +79,7 @@ add_custom_command(
     -DBDB_FOUND=${BDB_FOUND}
     -P ${CMAKE_CURRENT_SOURCE_DIR}/icalss_file.cmake
   DEPENDS ${icalss_LIB_SRCS} ${CMAKE_CURRENT_SOURCE_DIR}/icalss_file.cmake
+  COMMENT "Generate the aggregate libicalss header"
 )
 
 add_library(icalss ${LIBRARY_TYPE} ${icalss_LIB_SRCS})