From a3265742d1856feae55a8cf82f50c8abb894235f Mon Sep 17 00:00:00 2001 From: ideal Date: Mon, 11 Mar 2019 14:38:44 +0800 Subject: [PATCH 1/2] fix typo in comment --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 01961e85..8ddb5ca4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,7 +35,7 @@ option(WITH_EMBEDDED_SRC "build with embedded libcork, libipset, and libbloom so # Will set GIT_EXECUTABLE and GIT_FOUND # find_package(Git) -# When choose to not use embedded libcork, libipset and libboom, use libs shipped by system +# When choose to not use embedded libcork, libipset and libbloom, use libs shipped by system if (NOT WITH_EMBEDDED_SRC) set(USE_SYSTEM_SHARED_LIB TRUE) endif () From 56e805c99badb476146078023b45e441a6a8ddb1 Mon Sep 17 00:00:00 2001 From: ideal Date: Mon, 11 Mar 2019 14:57:00 +0800 Subject: [PATCH 2/2] cmake: installing man and doc files compliant to distribution standard --- doc/CMakeLists.txt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 683efe8f..bcff9dfc 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -69,13 +69,19 @@ if (NOT WITH_DOC_MAN) set_target_properties(doc-man PROPERTIES EXCLUDE_FROM_ALL TRUE) else () install(DIRECTORY ${CMAKE_BINARY_DIR}/man/ - DESTINATION man) + DESTINATION share/man/man1 + FILES_MATCHING PATTERN "*.1" + ) + install(DIRECTORY ${CMAKE_BINARY_DIR}/man/ + DESTINATION share/man/man8 + FILES_MATCHING PATTERN "*.8" + ) endif () if (NOT WITH_DOC_HTML) set_target_properties(doc-html PROPERTIES EXCLUDE_FROM_ALL TRUE) else () install(DIRECTORY ${CMAKE_BINARY_DIR}/html/ - DESTINATION doc/html) + DESTINATION share/doc/${PROJECT_NAME}) endif () # This is required for custom command