schtobia/ModernCppStarter
1
0
Fork 0
mirror of https://github.com/TheLartians/ModernCppStarter.git synced 2025-10-31 02:01:33 +01:00
Code Issues Activity

respect review comments

Browse source 
respect master project settings if any
This commit is contained in:
ClausKlein 2021-02-05 13:49:51 +01:00
parent d25ad76019
commit cd175563a3
2 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

12
CMakeLists.txt
View file

@ -20,9 +20,11 @@ endif()
# ---- Project settings ---- # ---- Project settings ----
if(NOT DEFINED CMAKE_CXX_STANDARD)
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS NO) set(CMAKE_CXX_EXTENSIONS NO)
endif()
# ---- Add dependencies via CPM ---- # ---- Add dependencies via CPM ----
# see https://github.com/TheLartians/CPM.cmake for more info # see https://github.com/TheLartians/CPM.cmake for more info
@ -36,8 +38,8 @@ CPMAddPackage(
VERSION 1.4 VERSION 1.4
) )
find_package(fmt) find_package(fmt 6)
if(NOT TARGET fmt::fmt) if(NOT TARGET fmt::fmt-header-only)
# FIXME this add a target without namespace! CK # FIXME this add a target without namespace! CK
CPMAddPackage( CPMAddPackage(
NAME fmt NAME fmt
@ -67,7 +69,7 @@ target_sources(Greeter PRIVATE ${headers} ${sources})
target_compile_options(Greeter PUBLIC "$<$<BOOL:${MSVC}>:/permissive->") target_compile_options(Greeter PUBLIC "$<$<BOOL:${MSVC}>:/permissive->")
# Link dependencies (if required) # Link dependencies (if required)
target_link_libraries(Greeter PRIVATE fmt::fmt) target_link_libraries(Greeter PRIVATE fmt::fmt-header-only)
target_include_directories( target_include_directories(
Greeter PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include> Greeter PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
@ -90,7 +92,5 @@ packageProject(
INCLUDE_DESTINATION include/${PROJECT_NAME}-${PROJECT_VERSION} INCLUDE_DESTINATION include/${PROJECT_NAME}-${PROJECT_VERSION}
VERSION_HEADER "${VERSION_HEADER_LOCATION}" VERSION_HEADER "${VERSION_HEADER_LOCATION}"
# semicolon separated list of the project's dependencies # semicolon separated list of the project's dependencies
DEPENDENCIES fmt # XXX DEPENDENCIES fmt
# install your library with a namespace! (do NOT add extra '::')
NAMESPACE ${PROJECT_NAME}
) )

12
documentation/Doxyfile
View file

@ -3,21 +3,21 @@
# To create a new Doxyfile containing all available options, call `doxygen -g` # To create a new Doxyfile containing all available options, call `doxygen -g`
# Get Project name and version from CMake # Get Project name and version from CMake
PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ PROJECT_NAME = Greeter
PROJECT_NUMBER = @DOXYGEN_PROJECT_VERSION@ PROJECT_NUMBER = 1.0
# Add sources # Add sources
INPUT = @DOXYGEN_PROJECT_ROOT@/README.md @DOXYGEN_PROJECT_ROOT@/include @DOXYGEN_PROJECT_ROOT@/documentation/pages INPUT = /Users/clausklein/Workspace/cpp/ModernCppStarter/documentation/../README.md /Users/clausklein/Workspace/cpp/ModernCppStarter/documentation/../include /Users/clausklein/Workspace/cpp/ModernCppStarter/documentation/../documentation/pages
EXTRACT_ALL = YES EXTRACT_ALL = YES
RECURSIVE = YES RECURSIVE = YES
OUTPUT_DIRECTORY = @DOXYGEN_OUTPUT_DIRECTORY@ OUTPUT_DIRECTORY = doxygen
# Use the README as a main page # Use the README as a main page
USE_MDFILE_AS_MAINPAGE = @DOXYGEN_PROJECT_ROOT@/README.md USE_MDFILE_AS_MAINPAGE = /Users/clausklein/Workspace/cpp/ModernCppStarter/documentation/../README.md
# set relative include paths # set relative include paths
FULL_PATH_NAMES = YES FULL_PATH_NAMES = YES
STRIP_FROM_PATH = @DOXYGEN_PROJECT_ROOT@/include @DOXYGEN_PROJECT_ROOT@ STRIP_FROM_PATH = /Users/clausklein/Workspace/cpp/ModernCppStarter/documentation/../include /Users/clausklein/Workspace/cpp/ModernCppStarter/documentation/..
# We use m.css to generate the html documentation, so we only need XML output # We use m.css to generate the html documentation, so we only need XML output
GENERATE_XML = YES GENERATE_XML = YES