Merge ad7438b into 89f1a52

.github/scripts/run-cmake-test

@@ -7,17 +7,25 @@ WORKSPACE=$(cd "$(dirname "${BASH_SOURCE[0]}")"/../.. && /bin/pwd -P)
 # Build with internal dependencies
 
 mkdir "${WORKSPACE}/_build_internal_deps" && cd $_
-cmake .. -DUSE_THIRDPARTY_LIBRARIES=ON -DENABLE_WARNINGS_AS_ERRORS=ON -DENABLE_COMPRESSION=OFF -DENABLE_PUSH=OFF
-make -j$(nproc)
+cmake -DUSE_THIRDPARTY_LIBRARIES=ON -DENABLE_WARNINGS_AS_ERRORS=ON -DENABLE_COMPRESSION=OFF -DENABLE_PUSH=OFF "${WORKSPACE}"
+make -j$(getconf _NPROCESSORS_ONLN)
 ctest -V
 mkdir -p deploy
 make DESTDIR="${PWD}/deploy" install
 
+mkdir "${WORKSPACE}/_import_internal_deps" && cd $_
+cmake "-Dprometheus-cpp_DIR=${WORKSPACE}/_build_internal_deps/deploy/usr/local/lib/cmake/prometheus-cpp" "${WORKSPACE}/cmake/project-import"
+make -j$(getconf _NPROCESSORS_ONLN)
+
 # Build with external dependencies
 
 mkdir "${WORKSPACE}/_build" && cd $_
-cmake .. -DUSE_THIRDPARTY_LIBRARIES=OFF "-DCMAKE_TOOLCHAIN_FILE=${VCPKG_INSTALLATION_ROOT}/scripts/buildsystems/vcpkg.cmake"
-make -j$(nproc)
+cmake -DUSE_THIRDPARTY_LIBRARIES=OFF "-DCMAKE_TOOLCHAIN_FILE=${VCPKG_INSTALLATION_ROOT}/scripts/buildsystems/vcpkg.cmake" "${WORKSPACE}"
+make -j$(getconf _NPROCESSORS_ONLN)
 ctest -V -LE Benchmark
 mkdir -p deploy
 make DESTDIR="${PWD}/deploy" install
+
+mkdir "${WORKSPACE}/_import" && cd $_
+cmake "-DCMAKE_TOOLCHAIN_FILE=${VCPKG_INSTALLATION_ROOT}/scripts/buildsystems/vcpkg.cmake" "-Dprometheus-cpp_DIR=${WORKSPACE}/_build/deploy/usr/local/lib/cmake/prometheus-cpp" "${WORKSPACE}/cmake/project-import"
+make -j$(getconf _NPROCESSORS_ONLN)

cmake/project-import/CMakeLists.txt

@@ -0,0 +1,17 @@
+cmake_minimum_required(VERSION 3.12 FATAL_ERROR)
+
+project(prometheus-cpp-import)
+
+set(CMAKE_CXX_STANDARD 11)
+
+find_package(prometheus-cpp CONFIG REQUIRED)
+
+if(PROMETHEUS_CPP_ENABLE_PUSH)
+  add_executable(sample-client sample_client.cc)
+  target_link_libraries(sample-client PRIVATE prometheus-cpp::push)
+endif()
+
+if(PROMETHEUS_CPP_ENABLE_PULL)
+  add_executable(sample-server sample_server.cc)
+  target_link_libraries(sample-server PRIVATE prometheus-cpp::pull)
+endif()

cmake/project-import/sample_client.cc

@@ -0,0 +1 @@
+../../push/tests/integration/sample_client.cc

cmake/project-import/sample_server.cc

@@ -0,0 +1 @@
+../../pull/tests/integration/sample_server.cc

pull/CMakeLists.txt

@@ -1,5 +1,10 @@
 if(USE_THIRDPARTY_LIBRARIES)
   find_package(civetweb-3rdparty CONFIG REQUIRED)
+  add_library(${PROJECT_NAME}::civetweb ALIAS civetweb)
+  install(
+    TARGETS civetweb
+    EXPORT ${PROJECT_NAME}-targets
+  )
 else()
   find_package(civetweb CONFIG REQUIRED)
 endif()
@@ -21,7 +26,7 @@ target_link_libraries(pull
     ${PROJECT_NAME}::core
   PRIVATE
     Threads::Threads
-    $<IF:$<BOOL:${USE_THIRDPARTY_LIBRARIES}>,civetweb,civetweb::civetweb-cpp>
+    $<IF:$<BOOL:${USE_THIRDPARTY_LIBRARIES}>,${PROJECT_NAME}::civetweb,civetweb::civetweb-cpp>
     $<$<AND:$<BOOL:UNIX>,$<NOT:$<BOOL:APPLE>>>:rt>
     $<$<BOOL:${ENABLE_COMPRESSION}>:ZLIB::ZLIB>
 )