Fix some install paths

variar · Apr 24, 2021 · 12a93e2 · 12a93e2
1 parent 230f1ad
commit 12a93e2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
@@ -39,6 +39,7 @@ add_subdirectory(maddy)
 add_subdirectory(whereami)
 
 if(KLOGG_USE_HYPERSCAN)
+set(BUILD_EXAMPLES OFF CACHE INTERNAL "" FORCE)
 add_subdirectory(hyperscan) #5.4.0
 endif(KLOGG_USE_HYPERSCAN)
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -62,6 +62,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 include(StandardProjectSettings)
 include(ucm)
 include(prepare_version)
+include(GNUInstallDirs)
 
 if(MSVC)
     IF (CMAKE_CXX_FLAGS MATCHES "/W[0-4]")	
@@ -175,17 +176,12 @@ if(UNIX)
         )
 
         install(FILES
-            ${COPYING_FILE} ${NOTICE_FILE}
-            DESTINATION share/doc/klogg)
-
-        install(FILES
-                ${README_FILE}
-                DESTINATION share/doc/klogg)
-
-        install(FILES
+            ${COPYING_FILE} 
+            ${NOTICE_FILE}
+            ${README_FILE}
             ${DOCUMENTATION_HTML}
             ${DOCUMENTATION_FILE}
-            DESTINATION share/doc/klogg)
+            DESTINATION ${CMAKE_INSTALL_DOCDIR})
 
         install(FILES
             ${CMAKE_CURRENT_SOURCE_DIR}/packaging/linux/klogg.desktop