diff --git a/CMakeLists.txt b/CMakeLists.txt index a0a3719..3b84a5f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,7 +56,7 @@ target_link_libraries(${PROJECT_NAME} PRIVATE fmt::fmt) target_include_directories( ${PROJECT_NAME} PUBLIC $ - $ + $ ) # ---- Create an installable target ---- diff --git a/documentation/CMakeLists.txt b/documentation/CMakeLists.txt index 109cdaa..4ae5b49 100644 --- a/documentation/CMakeLists.txt +++ b/documentation/CMakeLists.txt @@ -7,12 +7,12 @@ project(GreeterDocs) include(../cmake/CPM.cmake) CPMAddPackage("gh:mosra/m.css#42d4a9a48f31f5df6e246c948403b54b50574a2a") -CPMAddPackage(NAME ${CMAKE_PROJECT_NAME} SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/..) +CPMAddPackage(NAME Greeter SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/..) # ---- Doxygen variables ---- # set Doxyfile variables -set(DOXYGEN_PROJECT_NAME ${CMAKE_PROJECT_NAME}) +set(DOXYGEN_PROJECT_NAME Greeter) set(DOXYGEN_PROJECT_VERSION ${Greeter_VERSION}) set(DOXYGEN_PROJECT_ROOT "${CMAKE_CURRENT_LIST_DIR}/..") set(DOXYGEN_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/doxygen") diff --git a/standalone/CMakeLists.txt b/standalone/CMakeLists.txt index 051543e..d98277e 100644 --- a/standalone/CMakeLists.txt +++ b/standalone/CMakeLists.txt @@ -16,7 +16,7 @@ CPMAddPackage( OPTIONS "CXXOPTS_BUILD_EXAMPLES NO" "CXXOPTS_BUILD_TESTS NO" "CXXOPTS_ENABLE_INSTALL YES" ) -CPMAddPackage(NAME ${CMAKE_PROJECT_NAME} SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/..) +CPMAddPackage(NAME Greeter SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/..) # ---- Create standalone executable ---- diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index f333b9b..01c8e31 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -19,9 +19,9 @@ CPMAddPackage("gh:onqtam/doctest#2.4.5") CPMAddPackage("gh:TheLartians/Format.cmake@1.7.0") if(TEST_INSTALLED_VERSION) - find_package(${CMAKE_PROJECT_NAME} REQUIRED) + find_package(Greeter REQUIRED) else() - CPMAddPackage(NAME ${CMAKE_PROJECT_NAME} SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/..) + CPMAddPackage(NAME Greeter SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/..) endif() # ---- Create binary ---- @@ -34,9 +34,9 @@ set_target_properties(${PROJECT_NAME} PROPERTIES CXX_STANDARD 17) # enable compiler warnings if(NOT TEST_INSTALLED_VERSION) if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU") - target_compile_options(${CMAKE_PROJECT_NAME} PUBLIC -Wall -Wpedantic -Wextra -Werror) + target_compile_options(Greeter PUBLIC -Wall -Wpedantic -Wextra -Werror) elseif(MSVC) - target_compile_options(${CMAKE_PROJECT_NAME} PUBLIC /W4 /WX) + target_compile_options(Greeter PUBLIC /W4 /WX) target_compile_definitions(${PROJECT_NAME} PUBLIC DOCTEST_CONFIG_USE_STD_HEADERS) endif() endif() @@ -46,7 +46,8 @@ endif() enable_testing() # Note: doctest and similar testing frameworks can automatically configure CMake tests. For other -# testing frameworks add the tests target instead: add_test(NAME ${PROJECT_NAME} COMMAND GreeterTests) +# testing frameworks add the tests target instead: add_test(NAME ${PROJECT_NAME} COMMAND +# GreeterTests) include(${doctest_SOURCE_DIR}/scripts/cmake/doctest.cmake) doctest_discover_tests(${PROJECT_NAME}) @@ -54,6 +55,6 @@ doctest_discover_tests(${PROJECT_NAME}) # ---- code coverage ---- if(ENABLE_TEST_COVERAGE) - target_compile_options(${CMAKE_PROJECT_NAME} PUBLIC -O0 -g -fprofile-arcs -ftest-coverage) - target_link_options(${CMAKE_PROJECT_NAME} PUBLIC -fprofile-arcs -ftest-coverage) + target_compile_options(Greeter PUBLIC -O0 -g -fprofile-arcs -ftest-coverage) + target_link_options(Greeter PUBLIC -fprofile-arcs -ftest-coverage) endif()