diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3b88c3e --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +.idea +*debug* \ No newline at end of file diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 1392aa4..fcc8261 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 3.14...3.22) # Note: update this to your new project's name and version project( SBCBinaryFormat - VERSION 0.5.0 + VERSION 0.1.1 LANGUAGES CXX C ) diff --git a/cpp/README.md b/cpp/README.md index 21f58e7..9704fd7 100644 --- a/cpp/README.md +++ b/cpp/README.md @@ -9,7 +9,7 @@ To install this library, there are two options: 2. Clone this github repository anywhere in your project and in your "CMakeLists.txt" add a line called `add_subdirectory (LOCATION_OF_THIS_LIBRARY)`. Then, in `target_link_libraries` add - `RedDigitizer++::RedDigitizer++`. Done! + `SBCBinaryFormat::SBCBinaryFormat`. Done! # Examples diff --git a/cpp/include/SBCBinaryFormat/Utilities.hpp b/cpp/include/SBCBinaryFormat/Utilities.hpp index 01ce7d8..e207396 100644 --- a/cpp/include/SBCBinaryFormat/Utilities.hpp +++ b/cpp/include/SBCBinaryFormat/Utilities.hpp @@ -34,7 +34,7 @@ concept is_arithmetic_ptr = std::is_arithmetic_v< std::remove_pointer_t>> and not std::is_pointer_v; template -concept is_arithmetic_ptr_unpack = requires(T x) { +concept is_arithmetic_ptr_unpack = requires(T... x) { (... and is_arithmetic_ptr); }; diff --git a/cpp/test/CMakeLists.txt b/cpp/test/CMakeLists.txt index c0c00af..26e6094 100644 --- a/cpp/test/CMakeLists.txt +++ b/cpp/test/CMakeLists.txt @@ -17,12 +17,12 @@ include(cmake/CPM.cmake) CPMAddPackage("gh:onqtam/doctest@2.4.8") CPMAddPackage("gh:TheLartians/Format.cmake@1.7.3") - -if(TEST_INSTALLED_VERSION) - find_package(SBCBinaryFormat REQUIRED) -else() - CPMAddPackage(NAME SBCBinaryFormat SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/..) -endif() +# +#if(TEST_INSTALLED_VERSION) +# find_package(SBCBinaryFormat REQUIRED) +#else() +# CPMAddPackage(NAME SBCBinaryFormat SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/..) +#endif() # ---- Create binary ---- diff --git a/cpp/test/source/basic_test.cpp b/cpp/test/source/basic_test.cpp index d0b52f0..3c990c3 100644 --- a/cpp/test/source/basic_test.cpp +++ b/cpp/test/source/basic_test.cpp @@ -10,7 +10,7 @@ // my includes #include "SBCBinaryFormat/Reader.hpp" -#include "SBCBinaryFormat/Writers.hpp" +#include "SBCBinaryFormat/Writer.hpp" using namespace SBC::BinaryFormat;