Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions include/cpp_restapi/github/request.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include <string>

#include <cpp_restapi/iconnection.hpp>
#include "cpp_restapi_github_export.h"
#include "cpp_restapi_export.h"


namespace cpp_restapi::GitHub
Expand All @@ -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<cpp_restapi::IConnection>);
Expand Down
4 changes: 2 additions & 2 deletions include/cpp_restapi/link_header_pagination_strategy.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#endif

#include <cpp_restapi/ipagination_strategy.hpp>
#include "cpp_restapi_json_pagination_export.h"
#include "cpp_restapi_export.h"

namespace cpp_restapi
{
Expand All @@ -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;
Expand Down
74 changes: 23 additions & 51 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)
Expand All @@ -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}
)
9 changes: 2 additions & 7 deletions src/cpp-httplib_backend/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
9 changes: 2 additions & 7 deletions src/curl_backend/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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
)
1 change: 1 addition & 0 deletions src/curl_backend/connection.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

/**
* @author Kicer86@gmail.com
* @brief The initial file and api is return by Michał Walenciak.
Expand Down
22 changes: 3 additions & 19 deletions src/json_pagination/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
9 changes: 2 additions & 7 deletions src/qt_backend/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
17 changes: 1 addition & 16 deletions src/services/github/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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
)
1 change: 1 addition & 0 deletions src/version.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

#include <cpp_restapi/version.hpp>


Expand Down
Loading