From: Bernard Cafarelli Date: Mon, 1 Jan 2018 22:45:14 +0100 Subject: [PATCH] CMake fixes Raise CMake minimum version to 3.10 Handle documentation installation in the ebuild Add PROJECT_BINARY_DIR in include directories (to find config.h) --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ # # Define CMake minimum -cmake_minimum_required(VERSION 3.9) +cmake_minimum_required(VERSION 3.10) # # Project Name: wmcpuwatch @@ -26,6 +26,7 @@ configure_file( # # Define include directories include_directories( + "${PROJECT_BINARY_DIR}" ${DOCKAPP_INCLUDE_DIR} ${X11_X11_INCLUDE_PATH}) @@ -56,8 +57,6 @@ target_link_libraries(wmcpuwatch install(TARGETS wmcpuwatch RUNTIME DESTINATION bin) install(FILES wmcpuwatch.1 DESTINATION share/man/man1) install(FILES wmcpuwatch.desktop DESTINATION share/applications) -install(FILES README.md DESTINATION share/doc/${CMAKE_PROJECT_NAME}) -install(FILES ChangeLog DESTINATION share/doc/${CMAKE_PROJECT_NAME} RENAME changelog) # # Create a source tarball using CPack --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -20,9 +20,6 @@ if (DOXYGEN_FOUND) WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Generating code documentation" VERBATIM) - - # Install the documentation - install(DIRECTORY html DESTINATION share/doc/${CMAKE_PROJECT_NAME}) else (DOXYGEN_FOUND) message("doxygen not installed: Not creating code documentation") endif (DOXYGEN_FOUND)