7 files changed, 26 insertions, 17 deletions
diff --git a/demo/async/CMakeLists.txt b/demo/async/CMakeLists.txt
index 51ec014d..73798940 100644
--- a/demo/async/CMakeLists.txt
+++ b/demo/async/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright 2024 Staysail Systems, Inc. <info@staysail.tech>
+# Copyright 2025 Staysail Systems, Inc. <info@staysail.tech>
 # Copyright 2018 Capitar IT Group BV <info@capitar.com>
 #
 # This software is supplied under the terms of the MIT License, a
@@ -7,6 +7,9 @@
 # file was obtained (LICENSE.txt).  A copy of the license may also be
 # found online at https://opensource.org/licenses/MIT.
 
+# This CMakeLists file assumes you have INSTALLED NNG.
+# It does not work from the NNG source tree directly.
+
 cmake_minimum_required (VERSION 3.15)
 
 project(nng-asyncdemo)
@@ -16,8 +19,6 @@ set(PARALLEL 128 CACHE STRING "Parallelism (min 4, max 1000)")
 # Call this from your own project's makefile.
 find_package(nng CONFIG REQUIRED)
 
-find_package(Threads)
-
 add_executable(server server.c)
 target_link_libraries(server nng::nng)
 target_compile_definitions(server PRIVATE NNG_ELIDE_DEPRECATED PARALLEL=${PARALLEL})
diff --git a/demo/http_client/CMakeLists.txt b/demo/http_client/CMakeLists.txt
index c822f515..ef4ade40 100644
--- a/demo/http_client/CMakeLists.txt
+++ b/demo/http_client/CMakeLists.txt
@@ -1,12 +1,15 @@
 #
+# Copyright 2025 Staysail Systems, Inc. <info@staysail.tech>
 # Copyright 2018 Capitar IT Group BV <info@capitar.com>
-# Copyright 2024 Staysail Systems, Inc. <info@staysail.tech>
 #
 # This software is supplied under the terms of the MIT License, a
 # copy of which should be located in the distribution where this
 # file was obtained (LICENSE.txt).  A copy of the license may also be
 # found online at https://opensource.org/licenses/MIT.
 
+# This CMakeLists file assumes you have INSTALLED NNG.
+# It does not work from the NNG source tree directly.
+
 cmake_minimum_required (VERSION 3.15)
 
 project(http_client)
@@ -14,8 +17,6 @@ project(http_client)
 # Call this from your own project's makefile.
 find_package(nng CONFIG REQUIRED)
 
-find_package(Threads)
-
 add_executable(http_client http_client.c)
 target_link_libraries(http_client nng::nng)
 target_compile_definitions(http_client PRIVATE NNG_ELIDE_DEPRECATED)
diff --git a/demo/pubsub_forwarder/CMakeLists.txt b/demo/pubsub_forwarder/CMakeLists.txt
index 7fa12f5a..270ed9f1 100644
--- a/demo/pubsub_forwarder/CMakeLists.txt
+++ b/demo/pubsub_forwarder/CMakeLists.txt
@@ -3,11 +3,14 @@
 # file was obtained (LICENSE.txt).  A copy of the license may also be
 # found online at https://opensource.org/licenses/MIT.
 
+# This CMakeLists file assumes you have INSTALLED NNG.
+# It does not work from the NNG source tree directly.
+
 cmake_minimum_required(VERSION 3.15)
 project(pubsub_forwarder C)
 
 # Find the nng library
-find_package(nng REQUIRED)
+find_package(nng CONFIG REQUIRED)
 
 # Add the executable target
 add_executable(pubsub_forwarder pubsub_forwarder.c)
@@ -15,4 +18,4 @@ add_executable(pubsub_forwarder pubsub_forwarder.c)
 target_compile_options(pubsub_forwarder PRIVATE -Wall -Wextra -Wpedantic -Werror -O2)
 
 # Link against the nng library
-target_link_libraries(pubsub_forwarder PRIVATE nng)
+target_link_libraries(pubsub_forwarder PRIVATE nng::nng)
diff --git a/demo/raw/CMakeLists.txt b/demo/raw/CMakeLists.txt
index b8825ce8..cc331072 100644
--- a/demo/raw/CMakeLists.txt
+++ b/demo/raw/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright 2024 Staysail Systems, Inc. <info@staysail.tech>
+# Copyright 2025 Staysail Systems, Inc. <info@staysail.tech>
 # Copyright 2018 Capitar IT Group BV <info@capitar.com>
 #
 # This software is supplied under the terms of the MIT License, a
@@ -7,6 +7,9 @@
 # file was obtained (LICENSE.txt).  A copy of the license may also be
 # found online at https://opensource.org/licenses/MIT.
 
+# This CMakeLists file assumes you have INSTALLED NNG.
+# It does not work from the NNG source tree directly.
+
 cmake_minimum_required (VERSION 3.15)
 
 project(raw)
@@ -15,8 +18,6 @@ set(PARALLEL 128 CACHE STRING "Parallelism (min 4, max 1000)")
 
 find_package(nng CONFIG REQUIRED)
 
-find_package(Threads)
-
 add_executable(raw raw.c)
 target_link_libraries(raw nng::nng)
 target_compile_definitions(raw PRIVATE NNG_ELIDE_DEPRECATED PARALLEL=${PARALLEL})
diff --git a/demo/reqrep/CMakeLists.txt b/demo/reqrep/CMakeLists.txt
index 437f7f64..c8e149b0 100644
--- a/demo/reqrep/CMakeLists.txt
+++ b/demo/reqrep/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright 2024 Staysail Systems, Inc. <info@staysail.tech>
+# Copyright 2025 Staysail Systems, Inc. <info@staysail.tech>
 # Copyright 2018 Capitar IT Group BV <info@capitar.com>
 #
 # This software is supplied under the terms of the MIT License, a
@@ -7,14 +7,15 @@
 # file was obtained (LICENSE.txt).  A copy of the license may also be
 # found online at https://opensource.org/licenses/MIT.
 
+# This CMakeLists file assumes you have INSTALLED NNG.
+# It does not work from the NNG source tree directly.
+
 cmake_minimum_required (VERSION 3.15)
 
 project(reqrep)
 
 find_package(nng CONFIG REQUIRED)
 
-find_package(Threads)
-
 add_executable(reqrep reqrep.c)
 target_link_libraries(reqrep nng::nng)
 target_compile_definitions(reqrep PRIVATE NNG_ELIDE_DEPRECATED)
diff --git a/demo/rest/CMakeLists.txt b/demo/rest/CMakeLists.txt
index eae91227..9d8094c6 100644
--- a/demo/rest/CMakeLists.txt
+++ b/demo/rest/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright 2024 Staysail Systems, Inc. <info@staysail.tech>
+# Copyright 2025 Staysail Systems, Inc. <info@staysail.tech>
 # Copyright 2018 Capitar IT Group BV <info@capitar.com>
 #
 # This software is supplied under the terms of the MIT License, a
@@ -7,14 +7,15 @@
 # file was obtained (LICENSE.txt).  A copy of the license may also be
 # found online at https://opensource.org/licenses/MIT.
 
+# This CMakeLists file assumes you have INSTALLED NNG.
+# It does not work from the NNG source tree directly.
+
 cmake_minimum_required (VERSION 3.15)
 
 project(rest)
 
 find_package(nng CONFIG REQUIRED)
 
-find_package(Threads)
-
 add_executable(rest-server server.c)
 target_link_libraries(rest-server nng::nng)
 target_compile_definitions(rest-server PRIVATE NNG_ELIDE_DEPRECATED)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 237555b8..b49048fa 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -92,5 +92,6 @@ configure_package_config_file(${PROJECT_SOURCE_DIR}/cmake/${PROJECT_NAME}-config
         PATH_VARS INCLUDE_INSTALL_DIRS)
 
 install(FILES "${project_config}" "${version_config}"
+        ${PROJECT_SOURCE_DIR}/cmake/FindMbedTLS.cmake ${PROJECT_SOURCE_DIR}/cmake/FindWolfSSL.cmake
         DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}"
         COMPONENT Library)