Cobrazz improvements #316
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| function(userver_add_library NAME) | ||
|
|
||
| set(options) | ||
| set(one_value_args) | ||
| set(multi_value_args | ||
| SOURCES | ||
| PUBLIC_LINK_LIBRARIES | ||
| PRIVATE_LINK_LIBRARIES | ||
| ) | ||
| cmake_parse_arguments(USERVER_ADD_LIBRARY "${options}" "${one_value_args}" "${multi_value_args}" ${ARGN}) | ||
|
|
||
| if (BUILD_SHARED_LIBS) | ||
| add_library(${NAME} SHARED ${USERVER_ADD_LIBRARY_SOURCES}) | ||
|
|
||
| set_property(TARGET "${NAME}" PROPERTY POSITION_INDEPENDENT_CODE 1) | ||
|
|
||
| target_link_libraries(${NAME} | ||
| PUBLIC | ||
| ${USERVER_ADD_LIBRARY_PUBLIC_LINK_LIBRARIES} | ||
| PRIVATE | ||
| ${USERVER_ADD_LIBRARY_PRIVATE_LINK_LIBRARIES} | ||
| ) | ||
| else() | ||
| add_library(${NAME} STATIC ${USERVER_ADD_LIBRARY_SOURCES}) | ||
|
|
||
| target_link_libraries(${NAME} | ||
| PUBLIC | ||
| ${USERVER_ADD_LIBRARY_PUBLIC_LINK_LIBRARIES} | ||
| PRIVATE | ||
| ${USERVER_ADD_LIBRARY_PRIVATE_LINK_LIBRARIES} | ||
| ) | ||
| endif() | ||
|
|
||
| endfunction() | ||
|
|
||
| function(userver_target_link_libraries NAME) | ||
| set(options) | ||
| set(one_value_args) | ||
| set(multi_value_args | ||
| PUBLIC | ||
| PRIVATE | ||
| STATIC_PRIVATE | ||
| ) | ||
| cmake_parse_arguments(USERVER_ADD_LIBRARY "${options}" "${one_value_args}" "${multi_value_args}" ${ARGN}) | ||
|
|
||
| if(BUILD_SHARED_LIBS) | ||
| target_link_libraries(${NAME} | ||
| PUBLIC | ||
| ${USERVER_ADD_LIBRARY_PUBLIC} | ||
| ${USERVER_ADD_LIBRARY_PRIVATE} | ||
| PRIVATE | ||
| ${USERVER_ADD_LIBRARY_STATIC_PRIVATE} | ||
| ) | ||
| else() | ||
| target_link_libraries(${NAME} | ||
| PUBLIC | ||
| ${USERVER_ADD_LIBRARY_PUBLIC} | ||
| PRIVATE | ||
| ${USERVER_ADD_LIBRARY_PRIVATE} | ||
| ${USERVER_ADD_LIBRARY_STATIC_PRIVATE} | ||
| ) | ||
| endif() | ||
|
|
||
| endfunction() |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| function(userver_install_library) | ||
|
|
||
| set(options) | ||
| set(one_value_args) | ||
| set(multi_value_args TARGETS INCLUDE_DIR) | ||
| cmake_parse_arguments(USERVER_INSTALL "${options}" "${one_value_args}" "${multi_value_args}" ${ARGN}) | ||
|
|
||
| install(TARGETS ${USERVER_INSTALL_TARGETS} EXPORT userver-targets | ||
| PUBLIC_HEADER DESTINATION include) | ||
|
|
||
| if (NOT DEFINED USERVER_INSTALL_INCLUDE_DIR) | ||
| set(USERVER_INSTALL_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include/") | ||
| endif() | ||
|
|
||
| install(DIRECTORY "${USERVER_INSTALL_INCLUDE_DIR}/" | ||
| DESTINATION "include" | ||
| FILES_MATCHING | ||
| PATTERN "*.hpp" | ||
| PATTERN "*.ipp" | ||
| PATTERN "*.h" | ||
| PATTERN "*.inc" | ||
| ) | ||
|
|
||
| endfunction() | ||
|
|
||
| function(userver_export) | ||
| set(options) | ||
| set(one_value_args) | ||
| set(multi_value_args TARGETS) | ||
| cmake_parse_arguments(USERVER_EXPORT "${options}" "${one_value_args}" "${multi_value_args}" ${ARGN}) | ||
|
|
||
| install(TARGETS ${USERVER_EXPORT_TARGETS} EXPORT userver-targets | ||
| PUBLIC_HEADER DESTINATION include) | ||
|
|
||
| endfunction() |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| @PACKAGE_INIT@ | ||
|
|
||
| find_package(PkgConfig REQUIRED) | ||
|
|
||
| find_package(Threads REQUIRED) | ||
| find_package(Boost COMPONENTS filesystem program_options iostreams regex locale coroutine REQUIRED) | ||
| find_package(CURL REQUIRED) | ||
| find_package(OpenSSL REQUIRED) | ||
| find_package(Iconv REQUIRED) | ||
| find_package(ZLIB REQUIRED) | ||
|
|
||
| find_package(yaml-cpp REQUIRED) | ||
| add_library(libyamlcpp INTERFACE) | ||
| target_link_libraries(libyamlcpp INTERFACE ${YAML_CPP_LIBRARIES}) | ||
|
|
||
| pkg_check_modules (JEMALLOC jemalloc) | ||
| pkg_search_module(JEMALLOC REQUIRED jemalloc) | ||
| add_library(Jemalloc INTERFACE) | ||
| target_link_libraries(Jemalloc INTERFACE ${JEMALLOC_LIBRARIES}) | ||
|
|
||
| pkg_check_modules (LIBCARES libcares) | ||
| pkg_search_module(LIBCARES REQUIRED libcares) | ||
| add_library(c-ares INTERFACE) | ||
| target_link_libraries(c-ares INTERFACE ${LIBCARES_LIBRARIES}) | ||
|
|
||
| pkg_check_modules (LIBCRYPTOPP cryptopp) | ||
| pkg_search_module(LIBCRYPTOPP REQUIRED cryptopp) | ||
| add_library(CryptoPP INTERFACE) | ||
| target_link_libraries(CryptoPP INTERFACE ${LIBCRYPTOPP_LIBRARIES}) | ||
|
|
||
| pkg_check_modules (LIBEV libevent) | ||
| pkg_search_module(LIBEV REQUIRED libevent) | ||
| add_library(LibEv INTERFACE) | ||
| target_link_libraries(LibEv INTERFACE ${LIBEV_LIBRARIES}) | ||
|
|
||
| add_library(Http_Parser INTERFACE) | ||
| target_link_libraries(Http_Parser INTERFACE http_parser) | ||
|
|
||
| set(CMAKE_CONFIG_TARGETS_FILE @CMAKE_CONFIG_TARGETS_FILE@) | ||
| include("${CMAKE_CURRENT_LIST_DIR}/${CMAKE_CONFIG_TARGETS_FILE}") | ||
|
|
||
| check_required_components(userver) |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A few lines above we already do this, so the root_path should be already a real path. Are we missing something?