From cd175563a3bffaab4e86534646d93c39e9e6e174 Mon Sep 17 00:00:00 2001
From: ClausKlein <claus.klein@arcormail.de>
Date: Fri, 5 Feb 2021 13:49:51 +0100
Subject: [PATCH] respect review comments

respect master project settings if any
---
 CMakeLists.txt         | 18 +++++++++---------
 documentation/Doxyfile | 12 ++++++------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 550a081..3b70862 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,9 +20,11 @@ endif()
 
 # ---- Project settings ----
 
-set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_EXTENSIONS NO)
+if(NOT DEFINED CMAKE_CXX_STANDARD)
+  set(CMAKE_CXX_STANDARD 17)
+  set(CMAKE_CXX_STANDARD_REQUIRED ON)
+  set(CMAKE_CXX_EXTENSIONS NO)
+endif()
 
 # ---- Add dependencies via CPM ----
 # see https://github.com/TheLartians/CPM.cmake for more info
@@ -36,8 +38,8 @@ CPMAddPackage(
   VERSION 1.4
 )
 
-find_package(fmt)
-if(NOT TARGET fmt::fmt)
+find_package(fmt 6)
+if(NOT TARGET fmt::fmt-header-only)
   # FIXME this add a target without namespace! CK
   CPMAddPackage(
     NAME fmt
@@ -67,7 +69,7 @@ target_sources(Greeter PRIVATE ${headers} ${sources})
 target_compile_options(Greeter PUBLIC "$<$<BOOL:${MSVC}>:/permissive->")
 
 # Link dependencies (if required)
-target_link_libraries(Greeter PRIVATE fmt::fmt)
+target_link_libraries(Greeter PRIVATE fmt::fmt-header-only)
 
 target_include_directories(
   Greeter PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
@@ -90,7 +92,5 @@ packageProject(
   INCLUDE_DESTINATION include/${PROJECT_NAME}-${PROJECT_VERSION}
   VERSION_HEADER "${VERSION_HEADER_LOCATION}"
   # semicolon separated list of the project's dependencies
-  DEPENDENCIES fmt
-  # install your library with a namespace! (do NOT add extra '::')
-  NAMESPACE ${PROJECT_NAME}
+  # XXX DEPENDENCIES fmt
 )
diff --git a/documentation/Doxyfile b/documentation/Doxyfile
index 2c33e00..bbee656 100644
--- a/documentation/Doxyfile
+++ b/documentation/Doxyfile
@@ -3,21 +3,21 @@
 # To create a new Doxyfile containing all available options, call `doxygen -g`
 
 # Get Project name and version from CMake
-PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
-PROJECT_NUMBER = @DOXYGEN_PROJECT_VERSION@
+PROJECT_NAME = Greeter
+PROJECT_NUMBER = 1.0
 
 # 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
 RECURSIVE = YES
-OUTPUT_DIRECTORY = @DOXYGEN_OUTPUT_DIRECTORY@
+OUTPUT_DIRECTORY = doxygen
 
 # 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
 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
 GENERATE_XML = YES