@@ -23,22 +23,19 @@ option(flow-core_USE_EXTERNAL_JSON "Use an external JSON library" OFF)
2323# Dependencies
2424# -----------------------------------------------------------------------------
2525
26- if (flow-core_USE_EXTERNAL_JSON)
27- find_package (nlohmann_json 3.11.3 REQUIRED)
28- else ()
29- set (JSON_INSTALL ${flow-core_INSTALL})
30- endif ()
26+ include (cmake/CPM.cmake)
3127
32- add_subdirectory (third_party)
28+ CPMAddPackage("gh:nlohmann/json@3.11.3" )
29+ CPMAddPackage("gh:bshoshany/thread-pool@5.0.0" )
3330
3431# -----------------------------------------------------------------------------
3532# Library
3633# -----------------------------------------------------------------------------
3734
3835set (flow-core_HEADERS_DIR "${CMAKE_CURRENT_LIST_DIR} /include" )
3936file (GLOB flow-core_HEADERS "${flow-core_HEADERS_DIR}/flow/core/*.hpp" )
40- file (GLOB thread_pool_HEADERS "${thread_pool_SOURCE_DIR } /include/*.hpp" )
41- list (APPEND ${flow-core_HEADERS} ${thread_pool_HEADERS } )
37+ file (GLOB thread-pool_HEADERS "${thread-pool_SOURCE_DIR }/include/*.hpp" )
38+ list (APPEND ${flow-core_HEADERS} ${thread-pool_HEADERS })
4239
4340add_library (${PROJECT_NAME} SHARED
4441 src/Connection.cpp
@@ -59,10 +56,10 @@ add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME})
5956target_include_directories (${PROJECT_NAME}
6057 PUBLIC
6158 $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR} /include >
62- $<BUILD_INTERFACE:${thread_pool_SOURCE_DIR } /include >
59+ $<BUILD_INTERFACE:${thread-pool_SOURCE_DIR }/include >
6360 $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR} >
6461 PRIVATE
65- ${thread_pool_SOURCE_DIR } /include
62+ ${thread-pool_SOURCE_DIR }/include
6663 ${CMAKE_CURRENT_SOURCE_DIR} /include /flow/core
6764)
6865
@@ -100,7 +97,7 @@ if(flow-core_INSTALL)
10097 endif ()
10198
10299 install (DIRECTORY include / DESTINATION "${CMAKE_INSTALL_INCLUDEDIR} " )
103- install (DIRECTORY ${thread_pool_SOURCE_DIR } /include / DESTINATION "${CMAKE_INSTALL_INCLUDEDIR} " )
100+ install (DIRECTORY ${thread-pool_SOURCE_DIR }/include / DESTINATION "${CMAKE_INSTALL_INCLUDEDIR} " )
104101
105102 install (TARGETS ${export_targets}
106103 EXPORT ${PROJECT_NAME}
0 commit comments