Skip to content

Commit e0bf3f5

Browse files
DominicDdidincludeTheLartians
authored
Use ${PROJECT_NAME} instead of writing projectname multiple times (TheLartians#134)
* Remove duplicate mentions of project name and replaced it with ${PROJECT_NAME} variable Update CMakeLists.txt * Added ${CMAKE_PROJECT_NAME} * reverted usage of to Greeter and ran fix-format * Update test/CMakeLists.txt Co-authored-by: Dominic Dinser <dominic.dinser@leica-geosystems.com> Co-authored-by: Lars Melchior <TheLartians@users.noreply.github.com>
1 parent 69320a6 commit e0bf3f5

File tree

3 files changed

+17
-16
lines changed

3 files changed

+17
-16
lines changed

‎CMakeLists.txt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,20 +43,20 @@ file(GLOB_RECURSE sources CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/source/
4343
# ---- Create library ----
4444

4545
# Note: for header-only libraries change all PUBLIC flags to INTERFACE and create an interface
46-
# target: add_library(Greeter INTERFACE)
47-
add_library(Greeter ${headers} ${sources})
46+
# target: add_library(${PROJECT_NAME} INTERFACE)
47+
add_library(${PROJECT_NAME} ${headers} ${sources})
4848

49-
set_target_properties(Greeter PROPERTIES CXX_STANDARD 17)
49+
set_target_properties(${PROJECT_NAME} PROPERTIES CXX_STANDARD 17)
5050

5151
# being a cross-platform target, we enforce standards conformance on MSVC
52-
target_compile_options(Greeter PUBLIC "$<$<COMPILE_LANG_AND_ID:CXX,MSVC>:/permissive->")
52+
target_compile_options(${PROJECT_NAME} PUBLIC "$<$<COMPILE_LANG_AND_ID:CXX,MSVC>:/permissive->")
5353

5454
# Link dependencies
55-
target_link_libraries(Greeter PRIVATE fmt::fmt)
55+
target_link_libraries(${PROJECT_NAME} PRIVATE fmt::fmt)
5656

5757
target_include_directories(
58-
Greeter PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
59-
$<INSTALL_INTERFACE:include/${PROJECT_NAME}-${PROJECT_VERSION}>
58+
${PROJECT_NAME} PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
59+
$<INSTALL_INTERFACE:include/${PROJECT_NAME}-${PROJECT_VERSION}>
6060
)
6161

6262
# ---- Create an installable target ----

‎standalone/CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ CPMAddPackage(NAME Greeter SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/..)
2222

2323
file(GLOB sources CONFIGURE_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/source/*.cpp)
2424

25-
add_executable(GreeterStandalone ${sources})
25+
add_executable(${PROJECT_NAME} ${sources})
2626

27-
set_target_properties(GreeterStandalone PROPERTIES CXX_STANDARD 17 OUTPUT_NAME "Greeter")
27+
set_target_properties(${PROJECT_NAME} PROPERTIES CXX_STANDARD 17 OUTPUT_NAME "Greeter")
2828

29-
target_link_libraries(GreeterStandalone Greeter::Greeter cxxopts)
29+
target_link_libraries(${PROJECT_NAME} Greeter::Greeter cxxopts)

‎test/CMakeLists.txt‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,17 @@ endif()
2727
# ---- Create binary ----
2828

2929
file(GLOB sources CONFIGURE_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/source/*.cpp)
30-
add_executable(GreeterTests ${sources})
31-
target_link_libraries(GreeterTests doctest::doctest Greeter::Greeter)
32-
set_target_properties(GreeterTests PROPERTIES CXX_STANDARD 17)
30+
add_executable(${PROJECT_NAME} ${sources})
31+
target_link_libraries(${PROJECT_NAME} doctest::doctest Greeter::Greeter)
32+
set_target_properties(${PROJECT_NAME} PROPERTIES CXX_STANDARD 17)
3333

3434
# enable compiler warnings
3535
if(NOT TEST_INSTALLED_VERSION)
3636
if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU")
3737
target_compile_options(Greeter PUBLIC -Wall -Wpedantic -Wextra -Werror)
3838
elseif(MSVC)
3939
target_compile_options(Greeter PUBLIC /W4 /WX)
40-
target_compile_definitions(GreeterTests PUBLIC DOCTEST_CONFIG_USE_STD_HEADERS)
40+
target_compile_definitions(${PROJECT_NAME} PUBLIC DOCTEST_CONFIG_USE_STD_HEADERS)
4141
endif()
4242
endif()
4343

@@ -46,10 +46,11 @@ endif()
4646
enable_testing()
4747

4848
# Note: doctest and similar testing frameworks can automatically configure CMake tests. For other
49-
# testing frameworks add the tests target instead: add_test(NAME greeterTests COMMAND GreeterTests)
49+
# testing frameworks add the tests target instead: add_test(NAME ${PROJECT_NAME} COMMAND
50+
# ${PROJECT_NAME})
5051

5152
include(${doctest_SOURCE_DIR}/scripts/cmake/doctest.cmake)
52-
doctest_discover_tests(GreeterTests)
53+
doctest_discover_tests(${PROJECT_NAME})
5354

5455
# ---- code coverage ----
5556

0 commit comments

Comments
 (0)