Merge pull request #2065 from afrind/fix-install-interface-include-dirs

Fix installed picoquic-core target missing INTERFACE_INCLUDE_DIRECTORIES

Author: huitema

CMakeLists.txt

@@ -629,7 +629,8 @@ endif()
 
 install(TARGETS picoquic-core
     EXPORT picoquic-targets
-    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 
 if(PICOQUIC_FETCH_PTLS)
     set(LIB_PATH "${CMAKE_INSTALL_LIBDIR}/libpicoquic-core.a")

ci/embedding-test/install_test/CMakeLists.txt

@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 3.14)
+project(install_test LANGUAGES C)
+
+# Validate that an installed picoquic exports INTERFACE_INCLUDE_DIRECTORIES so
+# that consumers can #include <picoquic.h> without manually specifying the path.
+find_package(picoquic REQUIRED)
+
+add_executable(install_test main.c)
+target_link_libraries(install_test PRIVATE picoquic::picoquic-core)

ci/embedding-test/install_test/main.c

@@ -0,0 +1,8 @@
+#include <picoquic.h>
+#include <stdio.h>
+
+int main(void)
+{
+    printf("picoquic version: %s\n", PICOQUIC_VERSION);
+    return 0;
+}

ci/embedding-test/run.sh

@@ -19,24 +19,46 @@ PICOQUIC_ROOT="${1:-$(cd "$SCRIPT_DIR/../.." && pwd)}"
 shift 1 2>/dev/null || true
 
 BUILD_DIR="$(mktemp -d)"
-INSTALL_PREFIX="$(mktemp -d)"
-trap 'rm -rf "$BUILD_DIR" "$INSTALL_PREFIX"' EXIT
+FETCHCONTENT_INSTALL="$(mktemp -d)"
+STANDALONE_INSTALL="$(mktemp -d)"
+trap 'rm -rf "$BUILD_DIR" "$FETCHCONTENT_INSTALL" "$STANDALONE_INSTALL"' EXIT
 
+# --- Standalone install test ---
+# Validates that an installed picoquic (as getdeps does it) correctly exports
+# INTERFACE_INCLUDE_DIRECTORIES so consumers can #include <picoquic.h>.
+echo "==> Building and installing picoquic standalone"
+cmake -S "$PICOQUIC_ROOT" -B "$BUILD_DIR/picoquic" \
+    -DPICOQUIC_FETCH_PTLS=ON \
+    -DCMAKE_INSTALL_PREFIX="$STANDALONE_INSTALL" \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DBUILD_TESTING=OFF \
+    "$@"
+cmake --build "$BUILD_DIR/picoquic"
+cmake --install "$BUILD_DIR/picoquic"
+
+echo "==> Building and running install_test against standalone install"
+cmake -S "$SCRIPT_DIR/install_test" -B "$BUILD_DIR/install_test" \
+    -DCMAKE_PREFIX_PATH="$STANDALONE_INSTALL" \
+    -DCMAKE_BUILD_TYPE=Release
+cmake --build "$BUILD_DIR/install_test"
+"$BUILD_DIR/install_test/install_test"
+
+# --- FetchContent re-export test ---
+# Validates that a library embedding picoquic via FetchContent correctly
+# re-exports it to downstream consumers.
 echo "==> Building and installing sample_lib (picoquic root: $PICOQUIC_ROOT)"
 cmake -S "$SCRIPT_DIR/sample_lib" -B "$BUILD_DIR/sample_lib" \
     -DFETCHCONTENT_SOURCE_DIR_PICOQUIC="$PICOQUIC_ROOT" \
     -DPICOQUIC_FETCH_PTLS=ON \
-    -DCMAKE_INSTALL_PREFIX="$INSTALL_PREFIX" \
+    -DCMAKE_INSTALL_PREFIX="$FETCHCONTENT_INSTALL" \
     -DCMAKE_BUILD_TYPE=Release \
     "$@"
 cmake --build "$BUILD_DIR/sample_lib"
 cmake --install "$BUILD_DIR/sample_lib"
 
-echo "==> Building sample_app"
+echo "==> Building and running sample_app"
 cmake -S "$SCRIPT_DIR/sample_app" -B "$BUILD_DIR/sample_app" \
-    -DCMAKE_PREFIX_PATH="$INSTALL_PREFIX" \
+    -DCMAKE_PREFIX_PATH="$FETCHCONTENT_INSTALL" \
     -DCMAKE_BUILD_TYPE=Release
 cmake --build "$BUILD_DIR/sample_app"
-
-echo "==> Running sample_app"
 "$BUILD_DIR/sample_app/sample_app"