blob: 813a964e4bf641232c5598fbf3a1ca9398e4626c (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
|
From: Bernard Cafarelli <voyageur@gentoo.org>
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)
|
