From 724252b85d053e624755522bd5ba880dd8e35f64 Mon Sep 17 00:00:00 2001
From: slali87 <109802779+slali87@users.noreply.github.com>
Date: Fri, 19 Jul 2024 21:52:01 +0200
Subject: [PATCH]  IMPR: Improve linking between the code parts

Improve linking between the code parts

Plus, Ignore the 'modernize-type-traits' checker warning
Plus, Ignore clang-format in 1 place
Plus, Update version of 'actions/download-artifact' and
 'actions/upload-artifact'
---
 .github/workflows/CI.yml | 4 ++--
 src/CMakeLists.txt       | 5 ++---
 src_lib/CMakeLists.txt   | 3 +--
 test/CMakeLists.txt      | 7 ++++---
 test/MockHelloWorld.h    | 3 ++-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index b9ddb6a..81a6070 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -108,7 +108,7 @@ jobs:
           ./run.sh complex
       - name: Upload artifacts
         if: runner.os == 'Linux'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: artifacts
           path: |
@@ -130,7 +130,7 @@ jobs:
         run: |
           git clone --depth 1 --single-branch --branch gh-pages --no-tags https://github.com/${{ github.repository_owner }}/${{ github.event.repository.name }}.git
       - name: Download artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: artifacts
           path: .
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 223213a..1a78bab 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,5 +1,4 @@
-include_directories(../incl)
-
 add_library (${CMAKE_PROJECT_NAME}InnerLib App.h App.cpp)
+target_link_libraries (${CMAKE_PROJECT_NAME}InnerLib PRIVATE ${CMAKE_PROJECT_NAME}Lib)
 add_executable (${CMAKE_PROJECT_NAME} main.cpp)
-target_link_libraries (${CMAKE_PROJECT_NAME} ${CMAKE_PROJECT_NAME}InnerLib ${CMAKE_PROJECT_NAME}Lib)
+target_link_libraries (${CMAKE_PROJECT_NAME} PRIVATE ${CMAKE_PROJECT_NAME}InnerLib)
diff --git a/src_lib/CMakeLists.txt b/src_lib/CMakeLists.txt
index 15b4ae7..84f52ef 100644
--- a/src_lib/CMakeLists.txt
+++ b/src_lib/CMakeLists.txt
@@ -1,3 +1,2 @@
-include_directories(../incl)
-
 add_library (${CMAKE_PROJECT_NAME}Lib ../incl/Lib.h Lib.cpp ../incl/IHelloWorld.h ../incl/HelloWorld.h HelloWorld.cpp)
+target_include_directories(${CMAKE_PROJECT_NAME}Lib PUBLIC ../incl)
\ No newline at end of file
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 91860b4..b776b13 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,9 +1,8 @@
-include_directories(../incl)
+
 include_directories(../src)
 include_directories(../../../Deps/googletest/googletest/include)
 include_directories(../../../Deps/googletest/googlemock/include)
 
-add_executable (${CMAKE_PROJECT_NAME}Test main.cpp LibTestCases.cpp AppTestCases.cpp)
 find_library(GTest gtest HINTS ${CMAKE_CURRENT_SOURCE_DIR}/../../../Deps/googletest/build/lib/)
 find_library(GMock gmock HINTS ${CMAKE_CURRENT_SOURCE_DIR}/../../../Deps/googletest/build/lib/)
 if(UNIX)
@@ -11,6 +10,8 @@ if(UNIX)
 else()
   set(StaticLink -static)
 endif()
-target_link_libraries(${CMAKE_PROJECT_NAME}Test PUBLIC ${CMAKE_PROJECT_NAME}Lib ${CMAKE_PROJECT_NAME}InnerLib ${PThreadLib} ${StaticLink} ${GTest} ${GMock})
+
+add_executable (${CMAKE_PROJECT_NAME}Test MockHelloWorld.h main.cpp LibTestCases.cpp AppTestCases.cpp)
+target_link_libraries(${CMAKE_PROJECT_NAME}Test PRIVATE ${CMAKE_PROJECT_NAME}Lib ${CMAKE_PROJECT_NAME}InnerLib ${PThreadLib} ${StaticLink} ${GTest} ${GMock})
 
 add_test(NAME ${CMAKE_PROJECT_NAME}Test COMMAND ${CMAKE_PROJECT_NAME}Test)
diff --git a/test/MockHelloWorld.h b/test/MockHelloWorld.h
index 5ba3ea4..16b596d 100644
--- a/test/MockHelloWorld.h
+++ b/test/MockHelloWorld.h
@@ -14,6 +14,7 @@
  */
 class MockHelloWorld : public IHelloWorld {
  public:
-  // NOLINTNEXTLINE(misc-non-private-member-variables-in-classes)
+  // clang-format off
+  // NOLINTNEXTLINE(misc-non-private-member-variables-in-classes, modernize-type-traits) // clang-format on
   MOCK_METHOD(const char*, hello, (), (const, override));
 };
\ No newline at end of file