cmake: no more target_include_directories hacks

5 files changed, 10 insertions, 11 deletions

diff --git a/test/benchmarks/CMakeLists.txt b/test/benchmarks/CMakeLists.txt
index 09566cc..340dbcc 100644
--- a/test/benchmarks/CMakeLists.txt
+++ b/test/benchmarks/CMakeLists.txt
@@ -3,7 +3,6 @@ add_executable(benchmarks ${benchmarks_cpp})
 set_target_properties(benchmarks PROPERTIES OUTPUT_NAME math-server-benchmarks)
 
 target_link_libraries(benchmarks PRIVATE lexer)
-target_include_directories(benchmarks PRIVATE ../..)
 
 target_link_libraries(benchmarks PRIVATE benchmark benchmark_main)
 
diff --git a/test/benchmarks/lexer.cpp b/test/benchmarks/lexer.cpp
index 5b0612f..f4ee457 100644
--- a/test/benchmarks/lexer.cpp
+++ b/test/benchmarks/lexer.cpp
@@ -3,7 +3,7 @@
 // For details, see https://github.com/egor-tensin/math-server.
 // Distributed under the MIT License.
 
-#include <server/lexer/details/parse.hpp>
+#include <lexer/details/parse.hpp>
 
 #include <benchmark/benchmark.h>
 
diff --git a/test/unit_tests/CMakeLists.txt b/test/unit_tests/CMakeLists.txt
index 5a46f01..d84829d 100644
--- a/test/unit_tests/CMakeLists.txt
+++ b/test/unit_tests/CMakeLists.txt
@@ -1,9 +1,9 @@
 file(GLOB unit_tests_cpp "*.cpp")
 add_executable(unit_tests ${unit_tests_cpp})
-target_link_libraries(unit_tests PRIVATE lexer parser)
-target_include_directories(unit_tests PRIVATE ../..)
 set_target_properties(unit_tests PROPERTIES OUTPUT_NAME math-server-unit-tests)
 
+target_link_libraries(unit_tests PRIVATE lexer parser)
+
 find_package(Boost REQUIRED COMPONENTS unit_test_framework)
 target_link_libraries(unit_tests PRIVATE Boost::disable_autolinking Boost::unit_test_framework)
 
diff --git a/test/unit_tests/lexer.cpp b/test/unit_tests/lexer.cpp
index 9a3fc26..02e806f 100644
--- a/test/unit_tests/lexer.cpp
+++ b/test/unit_tests/lexer.cpp
@@ -3,11 +3,11 @@
 // For details, see https://github.com/egor-tensin/math-server.
 // Distributed under the MIT License.
 
-#include <server/lexer/details/parse.hpp>
-#include <server/lexer/error.hpp>
-#include <server/lexer/lexer.hpp>
-#include <server/lexer/token.hpp>
-#include <server/lexer/token_type.hpp>
+#include <lexer/details/parse.hpp>
+#include <lexer/error.hpp>
+#include <lexer/lexer.hpp>
+#include <lexer/token.hpp>
+#include <lexer/token_type.hpp>
 
 #include <boost/test/data/monomorphic.hpp>
 #include <boost/test/data/test_case.hpp>
diff --git a/test/unit_tests/parser.cpp b/test/unit_tests/parser.cpp
index 655ba39..b86d4d4 100644
--- a/test/unit_tests/parser.cpp
+++ b/test/unit_tests/parser.cpp
@@ -3,8 +3,8 @@
 // For details, see https://github.com/egor-tensin/math-server.
 // Distributed under the MIT License.
 
-#include <server/parser/error.hpp>
-#include <server/parser/parser.hpp>
+#include <parser/error.hpp>
+#include <parser/parser.hpp>
 
 #include <boost/test/data/monomorphic.hpp>
 #include <boost/test/data/test_case.hpp>