Skip to content

Commit a611c07

Browse files
LostPointerLostPointer
committed
feat: update cmake files
1 parent e60fd5a commit a611c07

File tree

12 files changed

+66
-50
lines changed

12 files changed

+66
-50
lines changed

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ foreach(dir ${tasks_dirs})
1818
ELSE()
1919
CONTINUE()
2020
ENDIF()
21-
endforeach()
21+
endforeach()

‎additional_tasks/template_task/CMakeLists.txt‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ get_filename_component(PROJECT_NAME ${CMAKE_CURRENT_LIST_DIR} NAME)
44
string(REPLACE " " "_" PROJECT_NAME ${PROJECT_NAME})
55
project(${PROJECT_NAME} C CXX)
66

7-
set(CMAKE_CXX_STANDARD 20)
7+
set(CMAKE_CXX_STANDARD 23)
88
set(CMAKE_CXX_STANDARD_REQUIRED ON)
99

1010
file(GLOB_RECURSE source_list "src/*.cpp" "src/*.hpp")
@@ -25,12 +25,16 @@ enable_testing()
2525
find_package(GTest REQUIRED)
2626
include_directories(${GTEST_INCLUDE_DIRS})
2727

28+
find_library(Utils ../)
29+
target_link_libraries(${PROJECT_NAME} PUBLIC Utils)
30+
2831
# Link runTests with what we want to test and the GTest and pthread library
2932
add_executable(${PROJECT_NAME}_tests ${test_source_list})
3033
target_link_libraries(
3134
${PROJECT_NAME}_tests
3235
GTest::gtest_main
36+
Utils
3337
)
3438

3539
include(GoogleTest)
36-
gtest_discover_tests(${PROJECT_NAME}_tests)
40+
gtest_discover_tests(${PROJECT_NAME}_tests)

‎lib/CMakeLists.txt‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
cmake_minimum_required(VERSION 3.10)
2+
project(Utils)
3+
4+
set(CMAKE_CXX_STANDARD 23)
25

36
file(GLOB_RECURSE lib_source_list "src/*.cpp" "src/*.hpp")
47

5-
add_library(Utils ${lib_source_list})
8+
add_library(${PROJECT_NAME} ${lib_source_list})
69

7-
target_include_directories(Utils PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
10+
target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src)

‎sandbox/template/CMakeLists.txt‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@ get_filename_component(PROJECT_NAME ${CMAKE_CURRENT_LIST_DIR} NAME)
44
string(REPLACE " " "_" PROJECT_NAME ${PROJECT_NAME})
55
project(${PROJECT_NAME} C CXX)
66

7-
set(CMAKE_CXX_STANDARD 20)
7+
set(CMAKE_CXX_STANDARD 23)
88
set(CMAKE_CXX_STANDARD_REQUIRED ON)
99

1010
file(GLOB_RECURSE source_list "src/*.cpp" "src/*.hpp")
11-
file(GLOB_RECURSE lib_source_list "../../lib/src/*.cpp" "../../lib/src/*.hpp")
1211
file(GLOB_RECURSE main_source_list "src/main.cpp")
1312
file(GLOB_RECURSE test_source_list "src/*.cpp")
1413
file(GLOB_RECURSE test_list "src/*test.cpp")
@@ -17,23 +16,25 @@ list(REMOVE_ITEM test_source_list ${main_source_list})
1716
list(REMOVE_ITEM source_list ${test_list})
1817

1918
include_directories(${PROJECT_NAME} PUBLIC src)
20-
include_directories(${PROJECT_NAME} PUBLIC ../lib/src)
2119

2220
add_executable(${PROJECT_NAME} ${source_list})
23-
target_link_libraries(${PROJECT_NAME} PUBLIC Utils)
2421

2522
# Locate GTest
2623
enable_testing()
2724
find_package(GTest REQUIRED)
2825
include_directories(${GTEST_INCLUDE_DIRS})
2926

27+
find_library(Utils ../)
28+
target_link_libraries(${PROJECT_NAME} PUBLIC Utils)
29+
3030
# Link runTests with what we want to test and the GTest and pthread library
3131
add_executable(${PROJECT_NAME}_tests ${test_source_list})
32+
3233
target_link_libraries(
3334
${PROJECT_NAME}_tests
3435
GTest::gtest_main
3536
Utils
3637
)
3738

3839
include(GoogleTest)
39-
gtest_discover_tests(${PROJECT_NAME}_tests)
40+
gtest_discover_tests(${PROJECT_NAME}_tests)

‎task_02/CMakeLists.txt‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@ get_filename_component(PROJECT_NAME ${CMAKE_CURRENT_LIST_DIR} NAME)
44
string(REPLACE " " "_" PROJECT_NAME ${PROJECT_NAME})
55
project(${PROJECT_NAME} C CXX)
66

7-
set(CMAKE_CXX_STANDARD 20)
7+
set(CMAKE_CXX_STANDARD 23)
88
set(CMAKE_CXX_STANDARD_REQUIRED ON)
99

1010
file(GLOB_RECURSE source_list "src/*.cpp" "src/*.hpp")
11-
file(GLOB_RECURSE lib_source_list "../lib/src/*.cpp" "../lib/src/*.hpp")
1211
file(GLOB_RECURSE main_source_list "src/main.cpp")
1312
file(GLOB_RECURSE test_source_list "src/*.cpp")
1413
file(GLOB_RECURSE test_list "src/*test.cpp")
@@ -17,16 +16,18 @@ list(REMOVE_ITEM test_source_list ${main_source_list})
1716
list(REMOVE_ITEM source_list ${test_list})
1817

1918
include_directories(${PROJECT_NAME} PUBLIC src)
20-
include_directories(${PROJECT_NAME} PUBLIC ../lib/src)
2119

2220
add_executable(${PROJECT_NAME} ${source_list})
23-
target_link_libraries(${PROJECT_NAME} PUBLIC Utils)
2421

2522
# Locate GTest
2623
enable_testing()
2724
find_package(GTest REQUIRED)
25+
2826
include_directories(${GTEST_INCLUDE_DIRS})
2927

28+
find_library(Utils ../)
29+
target_link_libraries(${PROJECT_NAME} PUBLIC Utils)
30+
3031
# Link runTests with what we want to test and the GTest and pthread library
3132
add_executable(${PROJECT_NAME}_tests ${test_source_list})
3233
target_link_libraries(
@@ -36,4 +37,4 @@ target_link_libraries(
3637
)
3738

3839
include(GoogleTest)
39-
gtest_discover_tests(${PROJECT_NAME}_tests)
40+
gtest_discover_tests(${PROJECT_NAME}_tests)

‎task_03/CMakeLists.txt‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@ get_filename_component(PROJECT_NAME ${CMAKE_CURRENT_LIST_DIR} NAME)
44
string(REPLACE " " "_" PROJECT_NAME ${PROJECT_NAME})
55
project(${PROJECT_NAME} C CXX)
66

7-
set(CMAKE_CXX_STANDARD 20)
7+
set(CMAKE_CXX_STANDARD 23)
88
set(CMAKE_CXX_STANDARD_REQUIRED ON)
99

1010
file(GLOB_RECURSE source_list "src/*.cpp" "src/*.hpp")
11-
file(GLOB_RECURSE lib_source_list "../lib/src/*.cpp" "../lib/src/*.hpp")
1211
file(GLOB_RECURSE main_source_list "src/main.cpp")
1312
file(GLOB_RECURSE test_source_list "src/*.cpp")
1413
file(GLOB_RECURSE test_list "src/*test.cpp")
@@ -17,16 +16,18 @@ list(REMOVE_ITEM test_source_list ${main_source_list})
1716
list(REMOVE_ITEM source_list ${test_list})
1817

1918
include_directories(${PROJECT_NAME} PUBLIC src)
20-
include_directories(${PROJECT_NAME} PUBLIC ../lib/src)
2119

2220
add_executable(${PROJECT_NAME} ${source_list})
23-
target_link_libraries(${PROJECT_NAME} PUBLIC Utils)
2421

2522
# Locate GTest
2623
enable_testing()
2724
find_package(GTest REQUIRED)
25+
2826
include_directories(${GTEST_INCLUDE_DIRS})
2927

28+
find_library(Utils ../)
29+
target_link_libraries(${PROJECT_NAME} PUBLIC Utils)
30+
3031
# Link runTests with what we want to test and the GTest and pthread library
3132
add_executable(${PROJECT_NAME}_tests ${test_source_list})
3233
target_link_libraries(
@@ -36,4 +37,4 @@ target_link_libraries(
3637
)
3738

3839
include(GoogleTest)
39-
gtest_discover_tests(${PROJECT_NAME}_tests)
40+
gtest_discover_tests(${PROJECT_NAME}_tests)

‎task_04/CMakeLists.txt‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@ get_filename_component(PROJECT_NAME ${CMAKE_CURRENT_LIST_DIR} NAME)
44
string(REPLACE " " "_" PROJECT_NAME ${PROJECT_NAME})
55
project(${PROJECT_NAME} C CXX)
66

7-
set(CMAKE_CXX_STANDARD 20)
7+
set(CMAKE_CXX_STANDARD 23)
88
set(CMAKE_CXX_STANDARD_REQUIRED ON)
99

1010
file(GLOB_RECURSE source_list "src/*.cpp" "src/*.hpp")
11-
file(GLOB_RECURSE lib_source_list "../lib/src/*.cpp" "../lib/src/*.hpp")
1211
file(GLOB_RECURSE main_source_list "src/main.cpp")
1312
file(GLOB_RECURSE test_source_list "src/*.cpp")
1413
file(GLOB_RECURSE test_list "src/*test.cpp")
@@ -17,16 +16,18 @@ list(REMOVE_ITEM test_source_list ${main_source_list})
1716
list(REMOVE_ITEM source_list ${test_list})
1817

1918
include_directories(${PROJECT_NAME} PUBLIC src)
20-
include_directories(${PROJECT_NAME} PUBLIC ../lib/src)
2119

2220
add_executable(${PROJECT_NAME} ${source_list})
23-
target_link_libraries(${PROJECT_NAME} PUBLIC Utils)
2421

2522
# Locate GTest
2623
enable_testing()
2724
find_package(GTest REQUIRED)
25+
2826
include_directories(${GTEST_INCLUDE_DIRS})
2927

28+
find_library(Utils ../)
29+
target_link_libraries(${PROJECT_NAME} PUBLIC Utils)
30+
3031
# Link runTests with what we want to test and the GTest and pthread library
3132
add_executable(${PROJECT_NAME}_tests ${test_source_list})
3233
target_link_libraries(
@@ -36,4 +37,4 @@ target_link_libraries(
3637
)
3738

3839
include(GoogleTest)
39-
gtest_discover_tests(${PROJECT_NAME}_tests)
40+
gtest_discover_tests(${PROJECT_NAME}_tests)

‎task_05/CMakeLists.txt‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@ get_filename_component(PROJECT_NAME ${CMAKE_CURRENT_LIST_DIR} NAME)
44
string(REPLACE " " "_" PROJECT_NAME ${PROJECT_NAME})
55
project(${PROJECT_NAME} C CXX)
66

7-
set(CMAKE_CXX_STANDARD 20)
7+
set(CMAKE_CXX_STANDARD 23)
88
set(CMAKE_CXX_STANDARD_REQUIRED ON)
99

1010
file(GLOB_RECURSE source_list "src/*.cpp" "src/*.hpp")
11-
file(GLOB_RECURSE lib_source_list "../lib/src/*.cpp" "../lib/src/*.hpp")
1211
file(GLOB_RECURSE main_source_list "src/main.cpp")
1312
file(GLOB_RECURSE test_source_list "src/*.cpp")
1413
file(GLOB_RECURSE test_list "src/*test.cpp")
@@ -17,16 +16,18 @@ list(REMOVE_ITEM test_source_list ${main_source_list})
1716
list(REMOVE_ITEM source_list ${test_list})
1817

1918
include_directories(${PROJECT_NAME} PUBLIC src)
20-
include_directories(${PROJECT_NAME} PUBLIC ../lib/src)
2119

2220
add_executable(${PROJECT_NAME} ${source_list})
23-
target_link_libraries(${PROJECT_NAME} PUBLIC Utils)
2421

2522
# Locate GTest
2623
enable_testing()
2724
find_package(GTest REQUIRED)
25+
2826
include_directories(${GTEST_INCLUDE_DIRS})
2927

28+
find_library(Utils ../)
29+
target_link_libraries(${PROJECT_NAME} PUBLIC Utils)
30+
3031
# Link runTests with what we want to test and the GTest and pthread library
3132
add_executable(${PROJECT_NAME}_tests ${test_source_list})
3233
target_link_libraries(
@@ -36,4 +37,4 @@ target_link_libraries(
3637
)
3738

3839
include(GoogleTest)
39-
gtest_discover_tests(${PROJECT_NAME}_tests)
40+
gtest_discover_tests(${PROJECT_NAME}_tests)

‎task_06/CMakeLists.txt‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@ get_filename_component(PROJECT_NAME ${CMAKE_CURRENT_LIST_DIR} NAME)
44
string(REPLACE " " "_" PROJECT_NAME ${PROJECT_NAME})
55
project(${PROJECT_NAME} C CXX)
66

7-
set(CMAKE_CXX_STANDARD 20)
7+
set(CMAKE_CXX_STANDARD 23)
88
set(CMAKE_CXX_STANDARD_REQUIRED ON)
99

1010
file(GLOB_RECURSE source_list "src/*.cpp" "src/*.hpp")
11-
file(GLOB_RECURSE lib_source_list "../lib/src/*.cpp" "../lib/src/*.hpp")
1211
file(GLOB_RECURSE main_source_list "src/main.cpp")
1312
file(GLOB_RECURSE test_source_list "src/*.cpp")
1413
file(GLOB_RECURSE test_list "src/*test.cpp")
@@ -17,16 +16,18 @@ list(REMOVE_ITEM test_source_list ${main_source_list})
1716
list(REMOVE_ITEM source_list ${test_list})
1817

1918
include_directories(${PROJECT_NAME} PUBLIC src)
20-
include_directories(${PROJECT_NAME} PUBLIC ../lib/src)
2119

2220
add_executable(${PROJECT_NAME} ${source_list})
23-
target_link_libraries(${PROJECT_NAME} PUBLIC Utils)
2421

2522
# Locate GTest
2623
enable_testing()
2724
find_package(GTest REQUIRED)
25+
2826
include_directories(${GTEST_INCLUDE_DIRS})
2927

28+
find_library(Utils ../)
29+
target_link_libraries(${PROJECT_NAME} PUBLIC Utils)
30+
3031
# Link runTests with what we want to test and the GTest and pthread library
3132
add_executable(${PROJECT_NAME}_tests ${test_source_list})
3233
target_link_libraries(
@@ -36,4 +37,4 @@ target_link_libraries(
3637
)
3738

3839
include(GoogleTest)
39-
gtest_discover_tests(${PROJECT_NAME}_tests)
40+
gtest_discover_tests(${PROJECT_NAME}_tests)

‎task_07/CMakeLists.txt‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@ get_filename_component(PROJECT_NAME ${CMAKE_CURRENT_LIST_DIR} NAME)
44
string(REPLACE " " "_" PROJECT_NAME ${PROJECT_NAME})
55
project(${PROJECT_NAME} C CXX)
66

7-
set(CMAKE_CXX_STANDARD 20)
7+
set(CMAKE_CXX_STANDARD 23)
88
set(CMAKE_CXX_STANDARD_REQUIRED ON)
99

1010
file(GLOB_RECURSE source_list "src/*.cpp" "src/*.hpp")
11-
file(GLOB_RECURSE lib_source_list "../lib/src/*.cpp" "../lib/src/*.hpp")
1211
file(GLOB_RECURSE main_source_list "src/main.cpp")
1312
file(GLOB_RECURSE test_source_list "src/*.cpp")
1413
file(GLOB_RECURSE test_list "src/*test.cpp")
@@ -17,16 +16,18 @@ list(REMOVE_ITEM test_source_list ${main_source_list})
1716
list(REMOVE_ITEM source_list ${test_list})
1817

1918
include_directories(${PROJECT_NAME} PUBLIC src)
20-
include_directories(${PROJECT_NAME} PUBLIC ../lib/src)
2119

2220
add_executable(${PROJECT_NAME} ${source_list})
23-
target_link_libraries(${PROJECT_NAME} PUBLIC Utils)
2421

2522
# Locate GTest
2623
enable_testing()
2724
find_package(GTest REQUIRED)
25+
2826
include_directories(${GTEST_INCLUDE_DIRS})
2927

28+
find_library(Utils ../)
29+
target_link_libraries(${PROJECT_NAME} PUBLIC Utils)
30+
3031
# Link runTests with what we want to test and the GTest and pthread library
3132
add_executable(${PROJECT_NAME}_tests ${test_source_list})
3233
target_link_libraries(
@@ -36,4 +37,4 @@ target_link_libraries(
3637
)
3738

3839
include(GoogleTest)
39-
gtest_discover_tests(${PROJECT_NAME}_tests)
40+
gtest_discover_tests(${PROJECT_NAME}_tests)

0 commit comments

Comments
 (0)