diff options
| author | thegeorg <[email protected]> | 2022-07-16 19:44:37 +0300 |
|---|---|---|
| committer | thegeorg <[email protected]> | 2022-07-16 19:44:37 +0300 |
| commit | 78785eee45c58b98adc859e9286991ec9d1382af (patch) | |
| tree | 835e98bcbd1f81fc242bb615b8bc0e1276274e4f | |
| parent | 7537371746d95bc04135888d09ac2068233932ea (diff) | |
Sync contrib/libs/jwt-cpp layout with upstream
| -rw-r--r-- | contrib/libs/jwt-cpp/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | contrib/libs/jwt-cpp/include/jwt-cpp/base.h (renamed from contrib/libs/jwt-cpp/base.h) | 0 | ||||
| -rw-r--r-- | contrib/libs/jwt-cpp/include/jwt-cpp/jwt.h (renamed from contrib/libs/jwt-cpp/jwt.h) | 0 | ||||
| -rw-r--r-- | contrib/libs/jwt-cpp/include/picojson/picojson.h (renamed from contrib/libs/jwt-cpp/picojson/picojson.h) | 0 | ||||
| -rw-r--r-- | ydb/library/login/login.cpp | 2 | ||||
| -rw-r--r-- | ydb/public/lib/jwt/jwt.cpp | 2 |
6 files changed, 5 insertions, 2 deletions
diff --git a/contrib/libs/jwt-cpp/CMakeLists.txt b/contrib/libs/jwt-cpp/CMakeLists.txt index 28fb6a036c0..33aa03b2322 100644 --- a/contrib/libs/jwt-cpp/CMakeLists.txt +++ b/contrib/libs/jwt-cpp/CMakeLists.txt @@ -9,6 +9,9 @@ find_package(OpenSSL REQUIRED) add_library(contrib-libs-jwt-cpp INTERFACE) +target_include_directories(contrib-libs-jwt-cpp INTERFACE + ${CMAKE_SOURCE_DIR}/contrib/libs/jwt-cpp/include +) target_link_libraries(contrib-libs-jwt-cpp INTERFACE OpenSSL::OpenSSL ) diff --git a/contrib/libs/jwt-cpp/base.h b/contrib/libs/jwt-cpp/include/jwt-cpp/base.h index 375e0eb08f3..375e0eb08f3 100644 --- a/contrib/libs/jwt-cpp/base.h +++ b/contrib/libs/jwt-cpp/include/jwt-cpp/base.h diff --git a/contrib/libs/jwt-cpp/jwt.h b/contrib/libs/jwt-cpp/include/jwt-cpp/jwt.h index 6e557298dd9..6e557298dd9 100644 --- a/contrib/libs/jwt-cpp/jwt.h +++ b/contrib/libs/jwt-cpp/include/jwt-cpp/jwt.h diff --git a/contrib/libs/jwt-cpp/picojson/picojson.h b/contrib/libs/jwt-cpp/include/picojson/picojson.h index b5b38017b5c..b5b38017b5c 100644 --- a/contrib/libs/jwt-cpp/picojson/picojson.h +++ b/contrib/libs/jwt-cpp/include/picojson/picojson.h diff --git a/ydb/library/login/login.cpp b/ydb/library/login/login.cpp index 0c0cac6d04c..98de0c59435 100644 --- a/ydb/library/login/login.cpp +++ b/ydb/library/login/login.cpp @@ -1,5 +1,5 @@ #undef __STDC_FORMAT_MACROS -#include <contrib/libs/jwt-cpp/jwt.h> +#include <contrib/libs/jwt-cpp/include/jwt-cpp/jwt.h> #include <library/cpp/digest/argonish/argon2.h> #include <library/cpp/string_utils/base64/base64.h> #include <library/cpp/json/json_value.h> diff --git a/ydb/public/lib/jwt/jwt.cpp b/ydb/public/lib/jwt/jwt.cpp index cbf77c46fff..6f0148e6ae0 100644 --- a/ydb/public/lib/jwt/jwt.cpp +++ b/ydb/public/lib/jwt/jwt.cpp @@ -1,5 +1,5 @@ #undef __STDC_FORMAT_MACROS -#include <contrib/libs/jwt-cpp/jwt.h> +#include <contrib/libs/jwt-cpp/include/jwt-cpp/jwt.h> #include "jwt.h" |