Переглянути джерело

CMake cleaning/refactoring

develop
Robin Thoni 6 роки тому
джерело
коміт
2cf0b75547

+ 4
- 2
CMakeLists.txt Переглянути файл

1
 cmake_minimum_required(VERSION 3.9)
1
 cmake_minimum_required(VERSION 3.9)
2
 project(qdnsagg)
2
 project(qdnsagg)
3
 
3
 
4
+enable_testing()
5
+
4
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
6
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
5
 set(CMAKE_AUTOMOC ON)
7
 set(CMAKE_AUTOMOC ON)
6
 set(CMAKE_CXX_STANDARD 17)
8
 set(CMAKE_CXX_STANDARD 17)
7
 
9
 
8
 find_package(Qt5Core REQUIRED)
10
 find_package(Qt5Core REQUIRED)
9
 
11
 
10
-add_executable(qdnsagg
12
+add_executable(${PROJECT_NAME}
11
         src/main.cpp
13
         src/main.cpp
12
         )
14
         )
13
 
15
 
14
 add_subdirectory(src/modules/dns-base)
16
 add_subdirectory(src/modules/dns-base)
15
 
17
 
16
-target_link_libraries(qdnsagg Qt5::Core qdnsagg-dns-base)
18
+target_link_libraries(${PROJECT_NAME} Qt5::Core qdnsagg-dns-base)

+ 3
- 3
src/modules/dns-base/CMakeLists.txt Переглянути файл

1
 cmake_minimum_required(VERSION 3.9)
1
 cmake_minimum_required(VERSION 3.9)
2
 project(qdnsagg-dns-base)
2
 project(qdnsagg-dns-base)
3
+enable_testing()
3
 
4
 
4
 include_directories(includes)
5
 include_directories(includes)
5
 
6
 
9
 
10
 
10
 find_package(Qt5Core REQUIRED)
11
 find_package(Qt5Core REQUIRED)
11
 
12
 
12
-add_library(qdnsagg-dns-base
13
+add_library(${PROJECT_NAME}
13
         src/QDnsHeader.cpp
14
         src/QDnsHeader.cpp
14
         includes/dns-base/QDnsHeader.h
15
         includes/dns-base/QDnsHeader.h
15
         src/QDnsLabel.cpp
16
         src/QDnsLabel.cpp
22
         includes/dns-base/QDnsPacket.h
23
         includes/dns-base/QDnsPacket.h
23
         )
24
         )
24
 
25
 
25
-target_link_libraries(qdnsagg-dns-base Qt5::Core)
26
+target_link_libraries(${PROJECT_NAME} Qt5::Core)
26
 
27
 
27
 find_package(GTest)
28
 find_package(GTest)
28
 if (GTEST_FOUND)
29
 if (GTEST_FOUND)
29
-    enable_testing()
30
     add_subdirectory(tests)
30
     add_subdirectory(tests)
31
 endif (GTEST_FOUND)
31
 endif (GTEST_FOUND)
32
 
32
 

+ 5
- 7
src/modules/dns-base/tests/CMakeLists.txt Переглянути файл

1
 cmake_minimum_required(VERSION 3.9)
1
 cmake_minimum_required(VERSION 3.9)
2
 project(qdnsagg-dns-base-tests)
2
 project(qdnsagg-dns-base-tests)
3
 
3
 
4
-enable_testing()
5
-
6
-include_directories(../includes)
7
-
8
-add_executable(qdnsagg-dns-base-tests
4
+add_executable(${PROJECT_NAME}
9
         main.cpp
5
         main.cpp
10
         DnsHeader.cpp
6
         DnsHeader.cpp
11
         DnsLabel.cpp
7
         DnsLabel.cpp
13
         DnsResourceRecord.cpp
9
         DnsResourceRecord.cpp
14
         DnsPacket.cpp)
10
         DnsPacket.cpp)
15
 
11
 
16
-target_link_libraries(qdnsagg-dns-base-tests gtest pthread qdnsagg-dns-base)
17
-add_test(qdnsagg-dns-base-tests ${CMAKE_CURRENT_BINARY_DIR}/qdnsagg-tests)
12
+target_link_libraries(${PROJECT_NAME} gtest pthread qdnsagg-dns-base)
13
+
14
+enable_testing()
15
+add_test(${PROJECT_NAME} ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME})

Завантаження…
Відмінити
Зберегти