Skip to content

Commit 14e0f93

Browse files
codejshacodejsha
committed
Merge branch 'feature/cmake' into develop
2 parents 6b367ab + 1d3b4bd commit 14e0f93

File tree

24 files changed

+46
-60
lines changed

24 files changed

+46
-60
lines changed

‎cpp-algorithm/CMakeLists.txt‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
cmake_minimum_required(VERSION 3.25)
22

33
project(
4-
cpp_algorithm
5-
VERSION 1.0
6-
DESCRIPTION
4+
cpp_algorithm
5+
VERSION 1.0
6+
DESCRIPTION
77
"Algorithm examples for C++"
8-
LANGUAGES CXX
8+
LANGUAGES CXX
99
)
1010

1111
set(CMAKE_CXX_STANDARD 20)
1212
set(CMAKE_CXX_STANDARD_REQUIRED ON)
1313
set(CMAKE_CXX_EXTENSIONS OFF)
1414

15+
enable_testing()
1516
add_subdirectory(src)

‎cpp-algorithm/src/array/benchmark/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ include_directories(${CMAKE_SOURCE_DIR}/src/array)
66
macro(add_target_benchmark target)
77
string(REPLACE "_benchmark" "" target_name ${target})
88
add_executable(${target} "${target}.cpp" "${CMAKE_SOURCE_DIR}/src/array/${target_name}.cpp")
9-
target_link_libraries(${target} PRIVATE benchmark::benchmark benchmark::benchmark_main ${ARGN})
9+
target_link_libraries(${target} PRIVATE benchmark::benchmark_main ${ARGN})
1010
target_compile_definitions(${target} PUBLIC -DBENCHMARK_STATIC_DEFINE)
1111
if(MSVC)
1212
### Edit and Continue for CMake projects

‎cpp-algorithm/src/array/test/CMakeLists.txt‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
enable_testing()
21
find_package(GTest REQUIRED)
32

43
if(WIN32)
@@ -11,7 +10,7 @@ include_directories(${CMAKE_SOURCE_DIR}/src/array)
1110
macro(add_target_test target)
1211
string(REPLACE "_test" "" target_name ${target})
1312
add_executable(${target} "${target}.cpp" "${CMAKE_SOURCE_DIR}/src/array/${target_name}.cpp")
14-
target_link_libraries(${target} PRIVATE GTest::gtest GTest::gtest_main ${ARGN})
13+
target_link_libraries(${target} PRIVATE GTest::gtest_main ${ARGN})
1514
if(MSVC)
1615
### Edit and Continue for CMake projects
1716
target_compile_options(${target} PUBLIC "/Zi")
@@ -22,7 +21,7 @@ endmacro()
2221

2322
macro(add_target_header_test target)
2423
add_executable(${target} "${target}.cpp")
25-
target_link_libraries(${target} PRIVATE GTest::gtest GTest::gtest_main ${ARGN})
24+
target_link_libraries(${target} PRIVATE GTest::gtest_main ${ARGN})
2625
if(MSVC)
2726
### Edit and Continue for CMake projects
2827
target_compile_options(${target} PUBLIC "/Zi")

‎cpp-algorithm/src/dynamic_programming/benchmark/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ include_directories(${CMAKE_SOURCE_DIR}/src/dynamic_programming)
77
macro(add_target_benchmark target)
88
string(REPLACE "_benchmark" "" target_name ${target})
99
add_executable(${target} "${target}.cpp" "${CMAKE_SOURCE_DIR}/src/dynamic_programming/${target_name}.cpp")
10-
target_link_libraries(${target} PRIVATE benchmark::benchmark benchmark::benchmark_main ${ARGN})
10+
target_link_libraries(${target} PRIVATE benchmark::benchmark_main ${ARGN})
1111
target_compile_definitions(${target} PUBLIC -DBENCHMARK_STATIC_DEFINE)
1212
if(MSVC)
1313
### Edit and Continue for CMake projects

‎cpp-algorithm/src/dynamic_programming/test/CMakeLists.txt‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
enable_testing()
21
find_package(GSL REQUIRED)
32
find_package(GTest REQUIRED)
43

@@ -12,7 +11,7 @@ include_directories(${CMAKE_SOURCE_DIR}/src/dynamic_programming)
1211
macro(add_target_test target)
1312
string(REPLACE "_test" "" target_name ${target})
1413
add_executable(${target} "${target}.cpp" "${CMAKE_SOURCE_DIR}/src/dynamic_programming/${target_name}.cpp")
15-
target_link_libraries(${target} PRIVATE GTest::gtest GTest::gtest_main ${ARGN})
14+
target_link_libraries(${target} PRIVATE GTest::gtest_main ${ARGN})
1615
if(MSVC)
1716
### Edit and Continue for CMake projects
1817
target_compile_options(${target} PUBLIC "/Zi")
@@ -23,7 +22,7 @@ endmacro()
2322

2423
macro(add_target_header_test target)
2524
add_executable(${target} "${target}.cpp")
26-
target_link_libraries(${target} PRIVATE GTest::gtest GTest::gtest_main ${ARGN})
25+
target_link_libraries(${target} PRIVATE GTest::gtest_main ${ARGN})
2726
if(MSVC)
2827
### Edit and Continue for CMake projects
2928
target_compile_options(${target} PUBLIC "/Zi")

‎cpp-algorithm/src/graph/test/CMakeLists.txt‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
enable_testing()
21
find_package(GTest REQUIRED)
32

43
if(WIN32)
@@ -11,7 +10,7 @@ include_directories(${CMAKE_SOURCE_DIR}/src/graph)
1110
macro(add_target_test target)
1211
string(REPLACE "_test" "" target_name ${target})
1312
add_executable(${target} "${target}.cpp" "${CMAKE_SOURCE_DIR}/src/graph/${target_name}.cpp")
14-
target_link_libraries(${target} PRIVATE GTest::gtest GTest::gtest_main ${ARGN})
13+
target_link_libraries(${target} PRIVATE GTest::gtest_main ${ARGN})
1514
if(MSVC)
1615
### Edit and Continue for CMake projects
1716
target_compile_options(${target} PUBLIC "/Zi")
@@ -22,7 +21,7 @@ endmacro()
2221

2322
macro(add_target_header_test target)
2423
add_executable(${target} "${target}.cpp")
25-
target_link_libraries(${target} PRIVATE GTest::gtest GTest::gtest_main ${ARGN})
24+
target_link_libraries(${target} PRIVATE GTest::gtest_main ${ARGN})
2625
if(MSVC)
2726
### Edit and Continue for CMake projects
2827
target_compile_options(${target} PUBLIC "/Zi")

‎cpp-algorithm/src/greedy/test/CMakeLists.txt‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
enable_testing()
21
find_package(GTest REQUIRED)
32

43
if(WIN32)
@@ -12,7 +11,7 @@ include_directories(${CMAKE_SOURCE_DIR}/src/tree)
1211
macro(add_target_test target)
1312
string(REPLACE "_test" "" target_name ${target})
1413
add_executable(${target} "${target}.cpp" "${CMAKE_SOURCE_DIR}/src/greedy/${target_name}.cpp")
15-
target_link_libraries(${target} PRIVATE GTest::gtest GTest::gtest_main ${ARGN})
14+
target_link_libraries(${target} PRIVATE GTest::gtest_main ${ARGN})
1615
if(MSVC)
1716
### Edit and Continue for CMake projects
1817
target_compile_options(${target} PUBLIC "/Zi")
@@ -23,7 +22,7 @@ endmacro()
2322

2423
macro(add_target_header_test target)
2524
add_executable(${target} "${target}.cpp")
26-
target_link_libraries(${target} PRIVATE GTest::gtest GTest::gtest_main ${ARGN})
25+
target_link_libraries(${target} PRIVATE GTest::gtest_main ${ARGN})
2726
if(MSVC)
2827
### Edit and Continue for CMake projects
2928
target_compile_options(${target} PUBLIC "/Zi")

‎cpp-algorithm/src/hash_table/test/CMakeLists.txt‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
enable_testing()
21
find_package(GTest REQUIRED)
32

43
if(WIN32)
@@ -12,7 +11,7 @@ include_directories(${CMAKE_SOURCE_DIR}/src/tree)
1211
macro(add_target_test target)
1312
string(REPLACE "_test" "" target_name ${target})
1413
add_executable(${target} "${target}.cpp" "${CMAKE_SOURCE_DIR}/src/hash_table/${target_name}.cpp")
15-
target_link_libraries(${target} PRIVATE GTest::gtest GTest::gtest_main ${ARGN})
14+
target_link_libraries(${target} PRIVATE GTest::gtest_main ${ARGN})
1615
if(MSVC)
1716
### Edit and Continue for CMake projects
1817
target_compile_options(${target} PUBLIC "/Zi")
@@ -23,7 +22,7 @@ endmacro()
2322

2423
macro(add_target_header_test target)
2524
add_executable(${target} "${target}.cpp")
26-
target_link_libraries(${target} PRIVATE GTest::gtest GTest::gtest_main ${ARGN})
25+
target_link_libraries(${target} PRIVATE GTest::gtest_main ${ARGN})
2726
if(MSVC)
2827
### Edit and Continue for CMake projects
2928
target_compile_options(${target} PUBLIC "/Zi")

‎cpp-algorithm/src/heap/benchmark/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ include_directories(${CMAKE_SOURCE_DIR}/src/heap)
77
macro(add_target_benchmark target)
88
string(REPLACE "_benchmark" "" target_name ${target})
99
add_executable(${target} "${target}.cpp" "${CMAKE_SOURCE_DIR}/src/heap/${target_name}.cpp")
10-
target_link_libraries(${target} PRIVATE benchmark::benchmark benchmark::benchmark_main ${ARGN})
10+
target_link_libraries(${target} PRIVATE benchmark::benchmark_main ${ARGN})
1111
target_compile_definitions(${target} PUBLIC -DBENCHMARK_STATIC_DEFINE)
1212
if(MSVC)
1313
### Edit and Continue for CMake projects
@@ -18,7 +18,7 @@ endmacro()
1818

1919
macro(add_target_header_benchmark target)
2020
add_executable(${target} "${target}.cpp")
21-
target_link_libraries(${target} PRIVATE benchmark::benchmark benchmark::benchmark_main ${ARGN})
21+
target_link_libraries(${target} PRIVATE benchmark::benchmark_main ${ARGN})
2222
target_compile_definitions(${target} PUBLIC -DBENCHMARK_STATIC_DEFINE)
2323
if(MSVC)
2424
### Edit and Continue for CMake projects

‎cpp-algorithm/src/heap/test/CMakeLists.txt‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
enable_testing()
21
find_package(GTest REQUIRED)
32

43
if(WIN32)
@@ -11,7 +10,7 @@ include_directories(${CMAKE_SOURCE_DIR}/src/heap)
1110
macro(add_target_test target)
1211
string(REPLACE "_test" "" target_name ${target})
1312
add_executable(${target} "${target}.cpp" "${CMAKE_SOURCE_DIR}/src/heap/${target_name}.cpp")
14-
target_link_libraries(${target} PRIVATE GTest::gtest GTest::gtest_main ${ARGN})
13+
target_link_libraries(${target} PRIVATE GTest::gtest_main ${ARGN})
1514
if(MSVC)
1615
### Edit and Continue for CMake projects
1716
target_compile_options(${target} PUBLIC "/Zi")
@@ -22,7 +21,7 @@ endmacro()
2221

2322
macro(add_target_header_test target)
2423
add_executable(${target} "${target}.cpp")
25-
target_link_libraries(${target} PRIVATE GTest::gtest GTest::gtest_main ${ARGN})
24+
target_link_libraries(${target} PRIVATE GTest::gtest_main ${ARGN})
2625
if(MSVC)
2726
### Edit and Continue for CMake projects
2827
target_compile_options(${target} PUBLIC "/Zi")

0 commit comments

Comments
 (0)