From 6a73fe361aafc274e7475df8c13a35aa5d5bf2da Mon Sep 17 00:00:00 2001
From: Mario Konrad <mario.konrad@gmx.net>
Date: Sun, 14 Nov 2021 17:18:26 +0100
Subject: [PATCH] General: move files to cleanup

---
 CMakeLists.txt                                     | 31 +++++++++++++++++++++-
 Packaging.cmake                                    | 29 --------------------
 cmake/CppCheck.cmake                               |  2 +-
 cmake/Documentation.cmake                          |  2 +-
 cppcheck-suppress.txt => src/cppcheck-suppress.txt |  0
 doxygen.conf.in => src/doxygen.conf.in             |  0
 6 files changed, 32 insertions(+), 32 deletions(-)
 delete mode 100644 Packaging.cmake
 rename cppcheck-suppress.txt => src/cppcheck-suppress.txt (100%)
 rename doxygen.conf.in => src/doxygen.conf.in (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 08e3ba53..919076e4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -86,4 +86,33 @@ if(CMAKE_BUILD_TYPE MATCHES Coverage)
 		)
 endif()
 
-include(Packaging)
+set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
+set(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR})
+set(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH})
+set(CPACK_PACKAGE_VERSION "${PROJECT_VERSION}")
+set(CPACK_PACKAGE_NAME "marnav")
+set(CPACK_PACKAGE_VENDOR "Mario Konrad")
+set(CPACK_PACKAGE_CONTACT "Mario Konrad <mario.konrad@gmx.net>")
+set(CPACK_PACAKGE_DESCRIPTION "Library for maritime navigation.")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Library")
+set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
+set(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
+set(CPACK_MONOLITHIC_INSTALL 1)
+#set(CPACK_PACKAGE_EXECUTABLES "??" "??")
+set(CPACK_STRIP_FILES true)
+
+# package: debian
+set(CPACK_DEBIAN_PACKAGE_NAME ${CPACK_DEBIAN_PACKAGE_NAME})
+set(CPACK_DEBIAN_PACKAGE_MAINTAINER ${CPACK_PACKAGE_CONTACT})
+set(CPACK_DEBIAN_PACKAGE_DESCRIPTION ${CPACK_PACAKGE_DESCRIPTION})
+set(CPACK_DEBIAN_PACKAGE_DEPENDS "libstdc++6 (>= 4.9)")
+set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.3)")
+set(CPACK_DEBIAN_PACKAGE_SECTION "misc")
+if (CMAKE_SIZEOF_VOID_P MATCHES "8")
+	set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "amd64")
+else()
+	set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "i386")
+endif()
+
+include(CPack)
+
diff --git a/Packaging.cmake b/Packaging.cmake
deleted file mode 100644
index 9f0f1aec..00000000
--- a/Packaging.cmake
+++ /dev/null
@@ -1,29 +0,0 @@
-set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
-set(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR})
-set(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH})
-set(CPACK_PACKAGE_VERSION "${PROJECT_VERSION}")
-set(CPACK_PACKAGE_NAME "marnav")
-set(CPACK_PACKAGE_VENDOR "Mario Konrad")
-set(CPACK_PACKAGE_CONTACT "Mario Konrad <mario.konrad@gmx.net>")
-set(CPACK_PACAKGE_DESCRIPTION "Library for maritime navigation.")
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Library")
-set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
-set(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
-set(CPACK_MONOLITHIC_INSTALL 1)
-#set(CPACK_PACKAGE_EXECUTABLES "??" "??")
-set(CPACK_STRIP_FILES true)
-
-# package: debian
-set(CPACK_DEBIAN_PACKAGE_NAME ${CPACK_DEBIAN_PACKAGE_NAME})
-set(CPACK_DEBIAN_PACKAGE_MAINTAINER ${CPACK_PACKAGE_CONTACT})
-set(CPACK_DEBIAN_PACKAGE_DESCRIPTION ${CPACK_PACAKGE_DESCRIPTION})
-set(CPACK_DEBIAN_PACKAGE_DEPENDS "libstdc++6 (>= 4.9)")
-set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.3)")
-set(CPACK_DEBIAN_PACKAGE_SECTION "misc")
-if (CMAKE_SIZEOF_VOID_P MATCHES "8")
-	set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "amd64")
-else()
-	set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "i386")
-endif()
-
-include(CPack)
diff --git a/cmake/CppCheck.cmake b/cmake/CppCheck.cmake
index 170ff4f5..78ea6b29 100644
--- a/cmake/CppCheck.cmake
+++ b/cmake/CppCheck.cmake
@@ -3,7 +3,7 @@ if(CPPCHECK_PATH)
 	message(STATUS "cppcheck: ${CPPCHECK_PATH}")
 	add_custom_target(cppcheck
 		COMMAND ${CPPCHECK_PATH}
-			--suppressions-list=${CMAKE_CURRENT_SOURCE_DIR}/cppcheck-suppress.txt
+			--suppressions-list=${CMAKE_CURRENT_SOURCE_DIR}/src/cppcheck-suppress.txt
 			--std=c++11
 			--platform=unix32
 			-v
diff --git a/cmake/Documentation.cmake b/cmake/Documentation.cmake
index 6c6ebb84..57049135 100644
--- a/cmake/Documentation.cmake
+++ b/cmake/Documentation.cmake
@@ -11,7 +11,7 @@ if(DOXYGEN_FOUND)
 		${CMAKE_CURRENT_BINARY_DIR}/doc/main.dox
 		)
 	configure_file(
-		${CMAKE_CURRENT_SOURCE_DIR}/doxygen.conf.in
+		${CMAKE_CURRENT_SOURCE_DIR}/src/doxygen.conf.in
 		${CMAKE_CURRENT_BINARY_DIR}/doxygen.conf
 		)
 	add_custom_target(doc
diff --git a/cppcheck-suppress.txt b/src/cppcheck-suppress.txt
similarity index 100%
rename from cppcheck-suppress.txt
rename to src/cppcheck-suppress.txt
diff --git a/doxygen.conf.in b/src/doxygen.conf.in
similarity index 100%
rename from doxygen.conf.in
rename to src/doxygen.conf.in
-- 
2.11.4.GIT