CMake cleaning/refactoring

CMakeLists.txt

@@ -1,16 +1,18 @@
 cmake_minimum_required(VERSION 3.9)
 project(qdnsagg)
 
+enable_testing()
+
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_CXX_STANDARD 17)
 
 find_package(Qt5Core REQUIRED)
 
-add_executable(qdnsagg
+add_executable(${PROJECT_NAME}
         src/main.cpp
         )
 
 add_subdirectory(src/modules/dns-base)
 
-target_link_libraries(qdnsagg Qt5::Core qdnsagg-dns-base)
+target_link_libraries(${PROJECT_NAME} Qt5::Core qdnsagg-dns-base)

src/modules/dns-base/CMakeLists.txt

@@ -1,5 +1,6 @@
 cmake_minimum_required(VERSION 3.9)
 project(qdnsagg-dns-base)
+enable_testing()
 
 include_directories(includes)
 
@@ -9,7 +10,7 @@ set(CMAKE_CXX_STANDARD 17)
 
 find_package(Qt5Core REQUIRED)
 
-add_library(qdnsagg-dns-base
+add_library(${PROJECT_NAME}
         src/QDnsHeader.cpp
         includes/dns-base/QDnsHeader.h
         src/QDnsLabel.cpp
@@ -22,11 +23,10 @@ add_library(qdnsagg-dns-base
         includes/dns-base/QDnsPacket.h
         )
 
-target_link_libraries(qdnsagg-dns-base Qt5::Core)
+target_link_libraries(${PROJECT_NAME} Qt5::Core)
 
 find_package(GTest)
 if (GTEST_FOUND)
-    enable_testing()
     add_subdirectory(tests)
 endif (GTEST_FOUND)
 

src/modules/dns-base/tests/CMakeLists.txt

@@ -1,11 +1,7 @@
 cmake_minimum_required(VERSION 3.9)
 project(qdnsagg-dns-base-tests)
 
-enable_testing()
-
-include_directories(../includes)
-
-add_executable(qdnsagg-dns-base-tests
+add_executable(${PROJECT_NAME}
         main.cpp
         DnsHeader.cpp
         DnsLabel.cpp
@@ -13,5 +9,7 @@ add_executable(qdnsagg-dns-base-tests
         DnsResourceRecord.cpp
         DnsPacket.cpp)
 
-target_link_libraries(qdnsagg-dns-base-tests gtest pthread qdnsagg-dns-base)
-add_test(qdnsagg-dns-base-tests ${CMAKE_CURRENT_BINARY_DIR}/qdnsagg-tests)
+target_link_libraries(${PROJECT_NAME} gtest pthread qdnsagg-dns-base)
+
+enable_testing()
+add_test(${PROJECT_NAME} ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME})