minor changes according PR review

Zubax · Aug 26, 2024 · 36c4e0c · 36c4e0c
1 parent 0ca985e
commit 36c4e0c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -35,8 +35,6 @@ FetchContent_Declare(
         GIT_TAG v1.15.2
 )
 FetchContent_MakeAvailable(googletest)
-#add_library(GTest::GTest INTERFACE IMPORTED)
-#target_link_libraries(GTest::GTest INTERFACE gtest_main)
 
 set(CMAKE_C_STANDARD 11)
 set(CMAKE_C_EXTENSIONS OFF)
@@ -51,8 +49,8 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-attributes")
 
 add_executable(test_olg_scheduler_cpp20 ${CMAKE_CURRENT_SOURCE_DIR}/tests/test_olg_scheduler.cpp)
 set_target_properties(test_olg_scheduler_cpp20 PROPERTIES CXX_STANDARD 20)
-target_include_directories(test_olg_scheduler_cpp20 PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include)
-target_include_directories(test_olg_scheduler_cpp20 SYSTEM PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/lib)
+target_include_directories(test_olg_scheduler_cpp20 PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/olg_scheduler)
+target_include_directories(test_olg_scheduler_cpp20 SYSTEM PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/lib/cavl)
 target_link_libraries(test_olg_scheduler_cpp20
         PRIVATE
         GTest::gmock_main

diff --git a/README.md b/README.md
@@ -5,7 +5,10 @@
 Generic single-file implementation of scheduler suitable for deeply embedded systems.
 "OLG" happens to be an abbreviation of Okay Let's Go
 and also a reference to the fact that it has a logarithmic asymptotic complexity.
-**Simply copy `olg_scheduler/scheduler.hpp` into your project tree and you are ready to roll.**
+**Simply copy `olg_scheduler.hpp` into your project tree and you are ready to roll.**
+The only dependency is the CAVL (`cavl.hpp`) header-only library
+(>= [v3.1.0](https://github.com/pavel-kirienko/cavl/tree/3.1.0)).
+
 The usage instructions are provided in the comments.
 The code is fully covered by manual tests with full state space exploration.
 

diff --git a/include/olg_scheduler/scheduler.hpp → include/olg_scheduler/olg_scheduler.hpp b/include/olg_scheduler/scheduler.hpp → include/olg_scheduler/olg_scheduler.hpp
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include <cavl/cavl.hpp>
+#include <cavl.hpp>
 
 #include <cassert>
 #include <chrono>

diff --git a/tests/test_olg_scheduler.cpp b/tests/test_olg_scheduler.cpp
@@ -15,7 +15,7 @@
 /// OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
 /// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "olg_scheduler/scheduler.hpp"
+#include "olg_scheduler.hpp"
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>