From ededaa6415f8db00ac2d2311c010b33d6eb0d375 Mon Sep 17 00:00:00 2001
From: Dan Kegel <dank@oblong.com>
Date: Mon, 5 Jun 2017 17:40:10 -0700
Subject: [PATCH] cmake: add missing configure variables, install headers and
 .pc file, use simpler line to invoke kyua, tweak build location of dll for
 ease of testing

---
 CMakeLists.txt            | 17 +++++++++++------
 libpkgconf/CMakeLists.txt | 10 +++++++++-
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2c5d20f..3015c6b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,9 +14,14 @@ CHECK_FUNCTION_EXISTS(strlcat HAVE_STRLCAT)
 CHECK_FUNCTION_EXISTS(strndup HAVE_STRNDUP)
 CHECK_FUNCTION_EXISTS(cygwin_conv_path HAVE_CYGWIN_CONV_PATH)
 SET(abs_top_srcdir ${pkgconf_SOURCE_DIR})
+SET(prefix ${CMAKE_INSTALL_PREFIX})
+SET(exec_prefix ${CMAKE_INSTALL_PREFIX})
+SET(datarootdir ${CMAKE_INSTALL_PREFIX}/share)
+SET(libdir ${CMAKE_INSTALL_PREFIX}/lib)
+SET(PKGCONFIGDIR "${libdir}/pkgconfig:${datarootdir}/pkgconfig")
 CONFIGURE_FILE(libpkgconf/config.h.cmake.in libpkgconf/config.h @ONLY)
-# Expand others
-FOREACH(file Kyuafile libpkgconf.pc tests/Kyuafile tests/test_env.sh)
+# Handy that these files need configuring; cygwin atf doesn't like windows line endings, and NEWLINE_STYLE helps.
+FOREACH(file Kyuafile tests/Kyuafile tests/test_env.sh)
    CONFIGURE_FILE(${file}.in ${file} @ONLY NEWLINE_STYLE UNIX)
 ENDFOREACH()
 
@@ -34,6 +39,8 @@ ADD_DEFINITIONS(-DPKG_DEFAULT_PATH=\"$(pkg_default_dir)\")
 ADD_DEFINITIONS(-DSYSTEM_INCLUDEDIR=\"$(system_includedir)\")
 ADD_DEFINITIONS(-DSYSTEM_LIBDIR=\"$(system_libdir)\")
 
+# Place shared libraries in same place as binary, for ease of setting PATH in test_env.sh
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${pkgconf_BINARY_DIR})
 ADD_SUBDIRECTORY(libpkgconf)
 
 INCLUDE_DIRECTORIES(${libpkgconf_BINARY_DIR})
@@ -55,11 +62,9 @@ SET(test_scripts
     tests/sysroot
     tests/version
    )
-# No accounting for taste
+# Handy that these files need configuring; cygwin atf doesn't like windows line endings, and NEWLINE_STYLE helps.
 FOREACH(file ${test_scripts})
    CONFIGURE_FILE(${file}.sh ${file} @ONLY NEWLINE_STYLE UNIX)
 ENDFOREACH()
 
-ADD_TEST(kyua
-    kyua --config=none test --kyuafile=${pkgconf_BINARY_DIR}/Kyuafile --build-root=${pkgconf_BINARY_DIR}
-    )
+ADD_TEST(kyua kyua --config=none test)
diff --git a/libpkgconf/CMakeLists.txt b/libpkgconf/CMakeLists.txt
index 5305f7b..8bbd35a 100644
--- a/libpkgconf/CMakeLists.txt
+++ b/libpkgconf/CMakeLists.txt
@@ -18,9 +18,17 @@ ADD_LIBRARY(libpkgconf SHARED
     queue.c
     tuple.c
 )
+SET_TARGET_PROPERTIES(libpkgconf PROPERTIES VERSION "2.0.0" SOVERSION 2)
 INSTALL(TARGETS libpkgconf
   RUNTIME DESTINATION bin
   LIBRARY DESTINATION lib
   ARCHIVE DESTINATION lib
 )
-SET_TARGET_PROPERTIES(libpkgconf PROPERTIES VERSION "2.0.0" SOVERSION 2)
+INSTALL(
+  FILES bsdstubs.h iter.h libpkgconf.h libpkgconf-api.h stdinc.h
+  DESTINATION include/libpkgconf
+)
+
+# Hypothesis: .pc files are a Unix thing, should always have unix line endings.
+CONFIGURE_FILE(${pkgconf_SOURCE_DIR}/libpkgconf.pc.in libpkgconf.pc @ONLY NEWLINE_STYLE UNIX)
+INSTALL(FILES ${libpkgconf_BINARY_DIR}/libpkgconf.pc DESTINATION lib/pkgconfig)