Commit graph

199 commits

Author SHA1 Message Date
Arun Muralidharan
1b41491d9e
Merge pull request #88 from Tradias/master
Fix github workflow
2021-10-18 08:48:25 +05:30
Dennis Hezel
dd849d536c style: Adjust name of GCC build job from GCC-10.3.0 to the correct GCC-9.3.0 in github workflow 2021-10-17 12:24:42 +02:00
Dennis Hezel
ace2ab8197 chore: Add -DCMAKE_TOOLCHAIN_FILE to the cmake configure step of the github workflow 2021-10-17 12:11:41 +02:00
Dennis Hezel
df1f82b708 chore: Fix CMAKE_ARGS env var in github workflow 2021-10-17 11:27:31 +02:00
Dennis Hezel
3e02ab9c4f trigger pipeline 2021-10-17 11:26:44 +02:00
Dennis Hezel
5d257fcf7e chore: Use vcpkg in github workflow instead of conan 2021-10-17 11:26:02 +02:00
Arun Muralidharan
8e987fbf14
Merge pull request #87 from Tradias/master
vcpkg related CMake improvements
2021-10-16 21:28:50 +05:30
Dennis Hezel
978f7a1c9c * Fix missing compile definition when installing the package with CPP_JWT_USE_VENDORED_NLOHMANN_JSON set to 'on'.
* Make installed package compatible with x86 even when it was build with x64.
* Exclude empty test/ directory and json/test_json.cc file from installation. * Mention that we are available on vcpkg in the README. * Fix compilation of examples on Windows.
* Add vcpkg.json file to make it easier for contributors to work on the project
* Bump version to 1.5.0
2021-10-16 11:44:01 +02:00
Arun Muralidharan
8272256dd0
Merge pull request #80 from licentia-eu/master
Upgrade nlohmann json library to 3.9.1 to fix build issues with gcc 10
2021-03-02 20:42:39 +05:30
BogDan Vatra
6e39899167 Upgrade nlohmann json library to 3.9.1 to fix build issues with gcc 10
- Upgrade json library to https://raw.githubusercontent.com/nlohmann/json/v3.9.1/single_include/nlohmann/json.hpp
- Nuke blob in the process
2021-02-15 13:44:34 +02:00
Arun Muralidharan
4dfd70b861
Merge pull request #76 from saurik/error-messages
fix: add new case to AlgorithmErrCategory::message
2020-12-23 14:36:07 +05:30
Jay Freeman (saurik)
5ef903fe33 fix: add new case to AlgorithmErrCategory::message 2020-12-21 20:13:01 +00:00
Arun Muralidharan
a824ff4983
Merge pull request #75 from saurik/undefined-macros
fix: C preprocessor defaults undefined macros to 0
2020-12-14 17:41:33 +05:30
Arun Muralidharan
128e3da13a
Merge branch 'master' into undefined-macros 2020-12-14 17:41:18 +05:30
Arun Muralidharan
c7faccdebb
Merge pull request #73 from j0nnyw/libressl-check-if-defined
Check LIBRESSL_VERSION_NUMBER only if defined.
2020-12-14 13:15:41 +05:30
Jay Freeman (saurik)
c504f674d1 fix: C preprocessor defaults undefined macros to 0 2020-12-12 19:38:59 +00:00
Jonny Weir
bdec618caa Check LIBRESSL_VERSION_NUMBER only if defined. 2020-11-16 16:53:30 +00:00
Arun Muralidharan
241bd8291a
Merge pull request #72 from torbatamas/master
Add LibreSSL version number in algorithms.hpp
2020-11-16 20:12:40 +05:30
Torba, Tamas (U513810)
fa499a9d2c Add LibreSSL version number in algorithms.hpp 2020-11-16 14:33:25 +01:00
Arun Muralidharan
f74e010207
Merge pull request #67 from wiebeytec/master
Clarify public key documentation and errors
2020-07-24 23:09:25 +05:30
Wiebe Cazemier
11cb283483 Clarify public key documentation and errors 2020-07-16 17:29:11 +02:00
Arun Muralidharan
42536e5f01
Merge pull request #66 from nikita-karatun/tests-fix
fix: algorithm::NONE string representation capitalized, tests linkage fixes
2020-07-08 22:00:39 +05:30
Nikita Karatun
20d997dd2f fix: algorithm::NONE string representation capitalized, tests linkage fixes 2020-07-08 16:28:19 +03:00
Arun Muralidharan
67504faf29
Merge pull request #64 from gocarlos/build--install-cmakes-find-package-files
build: install cmakes find package files
2020-06-17 13:05:30 +05:30
Arun M
2bb5623d39 explicit constructor initialization for EMap 2020-06-13 12:47:46 +05:30
Arun M
701f4f26c1 merge 2020-06-13 12:40:18 +05:30
Arun M
4752d47592 Deprecated BIO_f_base64 from boringssl #61 2020-06-13 12:39:28 +05:30
Carlos Gomes Martinho
d40fc510e9 fiX: add missing dependencies 2020-05-08 04:16:56 +02:00
Carlos Gomes Martinho
fd403e3df6 ci: also run on pull requests 2020-05-08 02:48:06 +02:00
Carlos Gomes Martinho
52bd9d5bb8 docs: add cmake usage instructions 2020-05-08 02:45:52 +02:00
Carlos Gomes Martinho
af21c2e26f build: install cmakes find package files 2020-05-08 02:35:53 +02:00
Arun Muralidharan
b6845543ed
Merge pull request #62 from gocarlos/patch-1
build: add add_library alias to cmake
2020-03-21 10:23:24 +05:30
Carlos Gomes Martinho
79d2c49b32
build: add add_library alias to cmake
this makes it possible to do:

```cmake
find_package(cpp-jwt REQUIRED)
add_executable(main main.cpp)
target_link_libraries(main cpp-jwt::cpp-jwt)
```
2020-03-18 19:48:52 +01:00
Arun Muralidharan
4b6ed54e2e
Merge pull request #60 from gocarlos/fix--compilation-with-visual-studio-14
fix: compilation with visual studio 14
2020-02-27 11:44:04 +05:30
Carlos Gomes Martinho
67f3dad16a fix: compilation with visual studio 14 2020-02-24 19:54:37 +01:00
Arun Muralidharan
8a066c9823
Merge pull request #59 from gocarlos/master
build: improve cmake scripts
2020-02-24 19:42:22 +05:30
Carlos Gomes Martinho
4dd70e5935 test: add ctest 2020-02-24 15:07:29 +01:00
Carlos Gomes Martinho
f7ffc00a29 chore: use w4 for msvc 2020-02-24 14:58:03 +01:00
Carlos Gomes Martinho
ac31850cdc chore: use cpp 11 by default 2020-02-24 13:38:11 +01:00
Carlos Gomes Martinho
9920f88379 chore: define vendor macro if needed 2020-02-24 13:33:43 +01:00
Carlos Gomes Martinho
f43b6e93fa chore: use both options for gtest include dir variable 2020-02-24 13:26:13 +01:00
Carlos Gomes Martinho
72c26dda67 ci: fix windows build 2020-02-24 13:18:06 +01:00
Carlos Gomes Martinho
d4b5525eb9 chore: use old lib variables for cmake 2020-02-24 13:16:44 +01:00
Carlos Gomes Martinho
92818726b5 chore: use env variable for git workspace 2020-02-24 13:04:36 +01:00
Carlos Gomes Martinho
7df9127c00 chore: initialize conan profile 2020-02-24 12:55:12 +01:00
Carlos Gomes Martinho
a4dc07112c ci: install setup tools 2020-02-24 12:49:36 +01:00
Carlos Gomes Martinho
6cc8790055 ci: use pip3 for python 2020-02-24 12:40:05 +01:00
Carlos Gomes Martinho
3b4ccc006d install conan before pipeline 2020-02-24 12:36:47 +01:00
Carlos Gomes Martinho
bc98be0883 test: add github pipelines 2020-02-24 11:21:17 +01:00
Carlos Gomes Martinho
564e9f8d23 build: add support for conan and make vendored json optional 2020-02-24 10:29:57 +01:00