From 4ede37d6a3f5284f90b9fe09816e36a1842660bb Mon Sep 17 00:00:00 2001 From: Stanislav Angelovic Date: Thu, 25 Apr 2019 12:42:08 +0200 Subject: [PATCH] Install additional documentation files --- CMakeLists.txt | 9 +++++---- doc/CMakeLists.txt | 6 ++++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fdeb43f..b8498bb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,9 +2,9 @@ # PROJECT INFORMATION #------------------------------- -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.7) -project(sdbus-c++ VERSION 0.6.0 LANGUAGES C CXX) +project(sdbus-c++ VERSION 0.5.2 LANGUAGES C CXX) include(GNUInstallDirs) # Installation directories for `install` command and pkgconfig file @@ -69,8 +69,8 @@ set(SDBUSCPP_SRCS ${SDBUSCPP_CPP_SRCS} ${SDBUSCPP_HDR_SRCS} ${SDBUSCPP_PUBLIC_HD # GENERAL COMPILER CONFIGURATION #------------------------------- -set(CMAKE_CXX_STANDARD 17) -add_compile_options(-W -Wextra -Wall -pedantic) +#set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17") include_directories("${CMAKE_SOURCE_DIR}/include") include_directories("${CMAKE_SOURCE_DIR}/src") @@ -138,6 +138,7 @@ option(BUILD_DOC "Build doxygen documentation for sdbus-c++ API" ON) if(BUILD_DOC) add_subdirectory("${CMAKE_SOURCE_DIR}/doc") + install(FILES README README.md NEWS COPYING ChangeLog AUTHORS DESTINATION ${CMAKE_INSTALL_DOCDIR}) endif() #---------------------------------- diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 3d97218..0f648ea 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -15,3 +15,9 @@ if(DOXYGEN_FOUND) else() message(WARNING "Documentation enabled, but Doxygen cannot be found") endif() + +install(FILES sdbus-c++-class-diagram.png + sdbus-c++-class-diagram.uml + systemd-dbus-config.md + using-sdbus-c++.md + DESTINATION ${CMAKE_INSTALL_DOCDIR})