diff --git a/include/cpp_restapi/github/request.hpp b/include/cpp_restapi/github/request.hpp index 0f5b910..51b04ec 100644 --- a/include/cpp_restapi/github/request.hpp +++ b/include/cpp_restapi/github/request.hpp @@ -12,7 +12,7 @@ #include #include -#include "cpp_restapi_github_export.h" +#include "cpp_restapi_export.h" namespace cpp_restapi::GitHub @@ -32,7 +32,7 @@ namespace cpp_restapi::GitHub * Provided by the optional `cpp_restapi_github` CMake target * (which itself depends on `cpp_restapi_json_pagination` and jsoncpp). */ - class CPP_RESTAPI_GITHUB_EXPORT Request + class CPP_RESTAPI_EXPORT Request { public: explicit Request(std::unique_ptr); diff --git a/include/cpp_restapi/link_header_pagination_strategy.hpp b/include/cpp_restapi/link_header_pagination_strategy.hpp index 932db43..528e2c6 100644 --- a/include/cpp_restapi/link_header_pagination_strategy.hpp +++ b/include/cpp_restapi/link_header_pagination_strategy.hpp @@ -8,7 +8,7 @@ #endif #include -#include "cpp_restapi_json_pagination_export.h" +#include "cpp_restapi_export.h" namespace cpp_restapi { @@ -23,7 +23,7 @@ namespace cpp_restapi * Provided by the optional `cpp_restapi_json_pagination` CMake target * (requires jsoncpp). */ - class CPP_RESTAPI_JSON_PAGINATION_EXPORT LinkHeaderPaginationStrategy: public IPaginationStrategy + class CPP_RESTAPI_EXPORT LinkHeaderPaginationStrategy: public IPaginationStrategy { public: std::string nextPageUrl(const std::string& responseHeaders) override; diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 681c0db..7cef125 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,34 +1,37 @@ -add_library(cpp_restapi_core OBJECT - base_connection.cpp - header_utils.cpp - threaded_connection.cpp - sse_parser.cpp +# Map CMake options to cmakedefine01 inputs consumed by version.hpp.in. +set(CPP_RESTAPI_HAS_JSON_PAGINATION ${CppRestAPI_JsonPagination}) +set(CPP_RESTAPI_HAS_GITHUB ${CppRestAPI_GitHub}) + +configure_file( + ${PROJECT_SOURCE_DIR}/include/cpp_restapi/version.hpp.in + ${PROJECT_BINARY_DIR}/cpp_restapi/version.hpp + @ONLY ) -set_target_properties(cpp_restapi_core PROPERTIES POSITION_INDEPENDENT_CODE ON) +add_library(cpp_restapi version.cpp) -target_include_directories(cpp_restapi_core +target_include_directories(cpp_restapi PUBLIC - ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}/include + ${PROJECT_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + PRIVATE + ${PROJECT_SOURCE_DIR}/src ) -target_compile_definitions(cpp_restapi_core PRIVATE cpp_restapi_EXPORTS) +generate_export_header(cpp_restapi) -generate_export_header(cpp_restapi_core - BASE_NAME cpp_restapi - EXPORT_FILE_NAME ${PROJECT_BINARY_DIR}/cpp_restapi_export.h +set_target_properties(cpp_restapi PROPERTIES + VERSION ${PROJECT_VERSION} + SOVERSION ${PROJECT_VERSION_MAJOR} ) -# Map CMake options to cmakedefine01 inputs consumed by version.hpp.in. -set(CPP_RESTAPI_HAS_JSON_PAGINATION ${CppRestAPI_JsonPagination}) -set(CPP_RESTAPI_HAS_GITHUB ${CppRestAPI_GitHub}) - -configure_file( - ${PROJECT_SOURCE_DIR}/include/cpp_restapi/version.hpp.in - ${PROJECT_BINARY_DIR}/cpp_restapi/version.hpp - @ONLY +target_sources(cpp_restapi PRIVATE + base_connection.cpp + header_utils.cpp + threaded_connection.cpp + sse_parser.cpp ) if(CppRestAPI_QtBackend) @@ -50,34 +53,3 @@ endif() if(CppRestAPI_GitHub) add_subdirectory(services/github) endif() - -# Umbrella library: the only artifact consumers link against. Composed -# entirely of OBJECT libraries plus its own version.cpp; type follows -# BUILD_SHARED_LIBS. -add_library(cpp_restapi version.cpp) - -# version.cpp includes the configured cpp_restapi/version.hpp and -# cpp_restapi_export.h, so it needs the same include paths the core -# OBJECT lib publishes. CPP_RESTAPI_EXPORTS makes runtimeVersion() an -# exported symbol on shared builds. -target_include_directories(cpp_restapi - PRIVATE - ${PROJECT_BINARY_DIR} - ${PROJECT_SOURCE_DIR}/include -) -target_compile_definitions(cpp_restapi PRIVATE cpp_restapi_EXPORTS) - -target_link_libraries(cpp_restapi PUBLIC cpp_restapi_core) - -if(TARGET cpp_restapi_json_pagination) - target_link_libraries(cpp_restapi PUBLIC cpp_restapi_json_pagination) -endif() - -if(TARGET cpp_restapi_github) - target_link_libraries(cpp_restapi PUBLIC cpp_restapi_github) -endif() - -set_target_properties(cpp_restapi PROPERTIES - VERSION ${PROJECT_VERSION} - SOVERSION ${PROJECT_VERSION_MAJOR} -) diff --git a/src/cpp-httplib_backend/CMakeLists.txt b/src/cpp-httplib_backend/CMakeLists.txt index 7cc438a..093016d 100644 --- a/src/cpp-httplib_backend/CMakeLists.txt +++ b/src/cpp-httplib_backend/CMakeLists.txt @@ -9,18 +9,13 @@ else() pkg_check_modules(HTTPLIB REQUIRED cpp-httplib) endif() -target_sources(cpp_restapi_core +target_sources(cpp_restapi PRIVATE connection.cpp sse_connection.cpp ) -target_link_libraries(cpp_restapi_core +target_link_libraries(cpp_restapi PUBLIC ${HTTPLIB_LIBRARIES} ) - -target_include_directories(cpp_restapi_core - PRIVATE - ${PROJECT_SOURCE_DIR}/src -) diff --git a/src/curl_backend/CMakeLists.txt b/src/curl_backend/CMakeLists.txt index 5606fb6..8b1dec9 100644 --- a/src/curl_backend/CMakeLists.txt +++ b/src/curl_backend/CMakeLists.txt @@ -1,18 +1,13 @@ find_package(CURL REQUIRED) -target_sources(cpp_restapi_core +target_sources(cpp_restapi PRIVATE connection.cpp sse_connection.cpp ) -target_link_libraries(cpp_restapi_core +target_link_libraries(cpp_restapi PUBLIC CURL::libcurl ) - -target_include_directories(cpp_restapi_core - PRIVATE - ${PROJECT_SOURCE_DIR}/src -) diff --git a/src/curl_backend/connection.cpp b/src/curl_backend/connection.cpp index e7f46c1..b5a2213 100644 --- a/src/curl_backend/connection.cpp +++ b/src/curl_backend/connection.cpp @@ -1,3 +1,4 @@ + /** * @author Kicer86@gmail.com * @brief The initial file and api is return by MichaƂ Walenciak. diff --git a/src/json_pagination/CMakeLists.txt b/src/json_pagination/CMakeLists.txt index ed11add..02c54ce 100644 --- a/src/json_pagination/CMakeLists.txt +++ b/src/json_pagination/CMakeLists.txt @@ -9,32 +9,16 @@ else() pkg_check_modules(JSONCPP REQUIRED jsoncpp) endif() -add_library(cpp_restapi_json_pagination OBJECT +target_sources(cpp_restapi PRIVATE link_header_pagination_strategy.cpp ) -set_target_properties(cpp_restapi_json_pagination PROPERTIES POSITION_INDEPENDENT_CODE ON) - -target_compile_definitions(cpp_restapi_json_pagination PRIVATE cpp_restapi_json_pagination_EXPORTS) - -target_include_directories(cpp_restapi_json_pagination +target_include_directories(cpp_restapi PRIVATE SYSTEM ${JSONCPP_INCLUDE_DIRS} ) -target_include_directories(cpp_restapi_json_pagination - PRIVATE - ${PROJECT_SOURCE_DIR}/src -) - -target_link_libraries(cpp_restapi_json_pagination - PUBLIC - cpp_restapi_core +target_link_libraries(cpp_restapi PRIVATE ${JSONCPP_LIBRARIES} ) - -generate_export_header(cpp_restapi_json_pagination - BASE_NAME cpp_restapi_json_pagination - EXPORT_FILE_NAME ${PROJECT_BINARY_DIR}/cpp_restapi_json_pagination_export.h -) diff --git a/src/qt_backend/CMakeLists.txt b/src/qt_backend/CMakeLists.txt index e5fd849..a8497fc 100644 --- a/src/qt_backend/CMakeLists.txt +++ b/src/qt_backend/CMakeLists.txt @@ -9,18 +9,13 @@ else() endif() endif() -target_sources(cpp_restapi_core PRIVATE +target_sources(cpp_restapi PRIVATE connection.cpp sse_connection.cpp ) -target_link_libraries(cpp_restapi_core +target_link_libraries(cpp_restapi PUBLIC Qt::Core Qt::Network ) - -target_include_directories(cpp_restapi_core - PRIVATE - ${PROJECT_SOURCE_DIR}/src -) diff --git a/src/services/github/CMakeLists.txt b/src/services/github/CMakeLists.txt index 182a5da..928e299 100644 --- a/src/services/github/CMakeLists.txt +++ b/src/services/github/CMakeLists.txt @@ -1,19 +1,4 @@ -add_library(cpp_restapi_github OBJECT +target_sources(cpp_restapi PRIVATE request.cpp ) - -set_target_properties(cpp_restapi_github PROPERTIES POSITION_INDEPENDENT_CODE ON) - -target_compile_definitions(cpp_restapi_github PRIVATE cpp_restapi_github_EXPORTS) - -target_link_libraries(cpp_restapi_github - PUBLIC - cpp_restapi_core - cpp_restapi_json_pagination -) - -generate_export_header(cpp_restapi_github - BASE_NAME cpp_restapi_github - EXPORT_FILE_NAME ${PROJECT_BINARY_DIR}/cpp_restapi_github_export.h -) diff --git a/src/version.cpp b/src/version.cpp index 5b802bc..c8737ac 100644 --- a/src/version.cpp +++ b/src/version.cpp @@ -1,3 +1,4 @@ + #include