watcher,watcher-c: add pkg-config files

Author: Will

CMakeLists.txt

@@ -19,19 +19,24 @@ project(
     C
 )
 
+include(CheckIPOSupported)
+include(FetchContent)
+include(GNUInstallDirs)
+
 #
 # Options, Variable & Constants
 #
 
-option(BUILD_LIB     "Create targets for the watcher-c libraries" ON)
-option(BUILD_BIN     "Create targets for the CLI binaries" ON)
-option(BUILD_HDR     "Create targets for the headers (both the C++ single-header library and the watcher-c library header)" ON)
-option(BUILD_TESTING "Create targets for the test programs" OFF)
-option(BUILD_SAN     "Mega-option to allow sanitizers" OFF)
-option(BUILD_ASAN    "Create targets address-sanitized libraries and binaries" OFF)
-option(BUILD_MSAN    "Create targets memory-sanitized libraries and binaries" OFF)
-option(BUILD_TSAN    "Create targets thread-sanitized libraries and binaries" OFF)
-option(BUILD_UBSAN   "Create targets undefined-behavior-sanitized libraries and binaries" OFF)
+option(BUILD_LIB        "Create targets for the watcher-c libraries" ON)
+option(BUILD_BIN        "Create targets for the CLI binaries" ON)
+option(BUILD_PKC_CONFIG "Create targets for the pkg-config files" ON)
+option(BUILD_HDR        "Create targets for the headers (both the C++ single-header library and the watcher-c library header)" ON)
+option(BUILD_TESTING    "Create targets for the test programs" OFF)
+option(BUILD_SAN        "Mega-option to allow sanitizers" OFF)
+option(BUILD_ASAN       "Create targets address-sanitized libraries and binaries" OFF)
+option(BUILD_MSAN       "Create targets memory-sanitized libraries and binaries" OFF)
+option(BUILD_TSAN       "Create targets thread-sanitized libraries and binaries" OFF)
+option(BUILD_UBSAN      "Create targets undefined-behavior-sanitized libraries and binaries" OFF)
 
 set(WTR_WATCHER_CXX_STD 17)
 
@@ -181,9 +186,6 @@ function(wtr_add_bin_target
   elseif(IS_TEST)
     message(STATUS "${NAME}: Added (BUILD_TESTING=${BUILD_TESTING})")
   endif()
-  include(CheckIPOSupported)
-  include(FetchContent)
-  include(GNUInstallDirs)
   add_executable("${NAME}" "${SRC_SET}")
   set_property(TARGET "${NAME}" PROPERTY CXX_STANDARD "${WTR_WATCHER_CXX_STD}")
   if(NOT WIN32 AND NOT IS_CC_MSVC AND NOT IS_CC_APPLECLANG)
@@ -241,7 +243,6 @@ function(wtr_add_lib_target NAME OUTPUT_NAME SRC_SET INC_SET LIB_TYPE)
     return()
   endif()
   message(STATUS "${NAME}: Added (BUILD_LIB=${BUILD_LIB})")
-  include(GNUInstallDirs)
   add_library("${NAME}" "${LIB_TYPE}" "${SRC_SET}")
   target_include_directories("${NAME}" PRIVATE "${INC_SET}")
   set_property(TARGET "${NAME}" PROPERTY CXX_STANDARD "${WTR_WATCHER_CXX_STD}")
@@ -252,7 +253,7 @@ function(wtr_add_lib_target NAME OUTPUT_NAME SRC_SET INC_SET LIB_TYPE)
   target_compile_options("${NAME}" PRIVATE "${COMPILE_OPTIONS}")
   if("${NAME}" STREQUAL "watcher-c-shared" AND LINUX)
     message(STATUS "watcher-c-shared: Adding version script")
-    target_link_options("${NAME}" PRIVATE "${LINK_OPTIONS};-Wl,--version-script=${CMAKE_SOURCE_DIR}/watcher-c/libwatcher-c.version")
+    target_link_options("${NAME}" PRIVATE "${LINK_OPTIONS};-Wl,--version-script=${CMAKE_SOURCE_DIR}/watcher-c/watcher-c.version")
   else()
     target_link_options("${NAME}" PRIVATE "${LINK_OPTIONS}")
   endif()
@@ -274,7 +275,6 @@ function(wtr_add_hdr_target NAME HDR_SET)
     return()
   endif()
   message(STATUS "${NAME}: Added (BUILD_HDR=${BUILD_HDR})")
-  include(GNUInstallDirs)
   add_library("${NAME}" INTERFACE "${HDR_SET}")
   target_include_directories("${NAME}" INTERFACE "${INCLPATH}")
   install(FILES "${HDR_SET}" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/wtr" COMPONENT "include")
@@ -449,3 +449,24 @@ wtr_add_bin_target(
   ""
 )
 
+if(BUILD_HDR AND BUILD_PKC_CONFIG)
+  message(STATUS "Generating watcher.h (BUILD_HDR=${BUILD_HDR}, BUILD_PKC_CONFIG=${BUILD_PKC_CONFIG})")
+  set(PC_WATCHER_LIBS_PRIVATE "${LINK_LIBRARIES}")
+  set(PC_WATCHER_LIBDIR "${CMAKE_INSTALL_LIBDIR}")
+  set(PC_WATCHER_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}/wtr")
+  configure_file("watcher.pc.in" "${CMAKE_BINARY_DIR}/watcher.pc" @ONLY)
+  install(FILES "${CMAKE_BINARY_DIR}/watcher.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" COMPONENT "include")
+else()
+  message(STATUS "Skipping watcher.pc generation (BUILD_HDR=${BUILD_HDR}, BUILD_PKC_CONFIG=${BUILD_PKC_CONFIG})")
+endif()
+
+if(BUILD_LIB AND BUILD_PKC_CONFIG)
+  message(STATUS "Generating watcher-c.pc (BUILD_LIB=${BUILD_LIB}, BUILD_PKC_CONFIG=${BUILD_PKC_CONFIG})")
+  set(PC_LIBWATCHER_C_LIBS_PRIVATE "${LINK_LIBRARIES}")
+  set(PC_LIBWATCHER_C_LIBDIR "${CMAKE_INSTALL_LIBDIR}")
+  set(PC_LIBWATCHER_C_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}/wtr")
+  configure_file("watcher-c/watcher-c.pc.in" "${CMAKE_BINARY_DIR}/watcher-c.pc" @ONLY)
+  install(FILES "${CMAKE_BINARY_DIR}/watcher-c.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" COMPONENT "include")
+else()
+  message(STATUS "Skipping watcher-c.pc generation (BUILD_LIB=${BUILD_LIB}, BUILD_PKC_CONFIG=${BUILD_PKC_CONFIG})")
+endif()

changelog.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.13.7
+
+Added `pkg-config` files for `watcher` and `watcher-c`.
+
 ## 0.13.6
 
 Special thanks to @DanielCodesphere and @jordan-woyak for their important contributions in this release.

watcher-c/meson.build

@@ -14,13 +14,22 @@ watcher_hpp_dep = declare_dependency(sources : watcher_hpp)
 
 libwatcher_c_name = 'watcher-c'
 
+libwatcher_c_pc_cfgdata = configuration_data()
+libwatcher_c_pc_cfgdata.set('PC_LIBWATCHER_C_PREFIX', get_option('prefix'))
+libwatcher_c_pc_cfgdata.set('PC_LIBWATCHER_C_LIBDIR', join_paths(get_option('prefix'), get_option('libdir')))
+libwatcher_c_pc_cfgdata.set('PC_LIBWATCHER_C_INCLUDEDIR', join_paths(get_option('prefix'), get_option('includedir')))
+libwatcher_c_pc_cfgdata.set('PROJECT_DESCRIPTION', 'watcher: a filesystem watcher')
+libwatcher_c_pc_cfgdata.set('PROJECT_HOMEPAGE_URL', 'github.com/e-dant/watcher')
+libwatcher_c_pc_cfgdata.set('PROJECT_VERSION', meson.project_version())
+
 if target_machine.system() == 'darwin'
   libwatcher_c_deps = [dependency('CoreServices'), dependency('CoreFoundation'), watcher_hpp_dep]
+  libwatcher_c_pc_cfgdata.set('PC_LIBWATCHER_C_LIBS_PRIVATE', '-framework CoreFoundation -framework CoreServices')
 else
   libwatcher_c_deps = [dependency('threads'), watcher_hpp_dep]
+  libwatcher_c_pc_cfgdata.set('PC_LIBWATCHER_C_LIBS_PRIVATE', '-lpthread')
 endif
 
-
 libwatcher_c = library(
   libwatcher_c_name,
   ['src/watcher-c.cpp'],
@@ -32,6 +41,14 @@ libwatcher_c = library(
   version : meson.project_version(),
 )
 
+libwatcher_c_pc = configure_file(
+  input : 'watcher-c.pc.in',
+  output : 'watcher-c.pc',
+  configuration : libwatcher_c_pc_cfgdata,
+  install : true,
+  install_dir : join_paths(get_option('libdir'), 'pkgconfig')
+)
+
 test_libwatcher_c = executable(
   'test-watcher-c',
   ['src/test-watcher-c.c'],

watcher-c/watcher-c.pc.in

@@ -0,0 +1,14 @@
+prefix=@PC_LIBWATCHER_C_PREFIX@
+exec_prefix=${prefix}
+libdir=@PC_LIBWATCHER_C_LIBDIR@
+includedir=@PC_LIBWATCHER_C_INCLUDEDIR@
+
+Name: libwatcher-c
+Description: @PROJECT_DESCRIPTION@
+URL: @PROJECT_HOMEPAGE_URL@
+Version: @PROJECT_VERSION@
+Requires:
+Conflicts:
+Libs: -L${libdir} -lwatcher-c
+Libs.private: @PC_LIBWATCHER_C_LIBS_PRIVATE@
+Cflags: -I${includedir}

watcher-c/libwatcher-c.version watcher-c/watcher-c.versionwatcher-c/libwatcher-c.version renamed to watcher-c/watcher-c.version

@@ -0,0 +1,14 @@
+prefix=@PC_WATCHER_PREFIX@
+exec_prefix=${prefix}
+libdir=@PC_WATCHER_LIBDIR@
+includedir=@PC_WATCHER_INCLUDEDIR@
+
+Name: watcher
+Description: @PROJECT_DESCRIPTION@
+URL: @PROJECT_HOMEPAGE_URL@
+Version: @PROJECT_VERSION@
+Requires:
+Conflicts:
+Libs:
+Libs.private: @PC_WATCHER_LIBS_PRIVATE@
+Cflags: -I${includedir}