move cmake files for lib into src

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9cbb069286fbc81ca47d1f7822e829013bcc7595..d93f83eea3fa90e2b51dc199cd3cebe6fe0fd45a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,7 +29,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}/src)
 message(VERBOSE "Include directory: libs/spandisc/include")
 include_directories(libs/spandisc/src)
 message(STATUS "Include subproject spandisc: libs/spandisc")
-add_subdirectory(libs/spandisc)
+add_subdirectory(libs/spandisc/src)
 
 # create target from source
 file(GLOB SOURCES src/*.c)
@@ -84,7 +84,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
                set(CPACK_DEBIAN_DISCSPAN_PACKAGE_DEPENDS "discspan")
        endif()
 
-       include(libs/spandisc/CPackConfig.cmake)
+       include(libs/spandisc/src/CPackConfig.cmake)
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
        set(CPACK_GENERATOR "ZIP")
 endif()

diff --git a/libs/spandisc/CMakeLists.txt b/libs/spandisc/CMakeLists.txt
deleted file mode 100644 (file)
index 7b16242..0000000
--- a/libs/spandisc/CMakeLists.txt
+++ /dev/null
@@ -1,78 +0,0 @@
-cmake_minimum_required(VERSION 3.13.4)
-
-project(spandisc)
-
-set(CMAKE_INSTALL_PREFIX "/usr/local" CACHE PATH "Install prefix")
-message(STATUS "CMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}")
-
-set(PROJECT_VERSION_MAJOR 1)
-set(PROJECT_VERSION_MINOR 0)
-set(PROJECT_VERSION_PATCH 0)
-set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
-
-option(BUILD_SHARED_LIBS "build shared libs" ON)
-
-# configure file
-message(STATUS "Generating header: src/config_spandisc.h")
-configure_file(${CMAKE_CURRENT_LIST_DIR}/src/config_spandisc.h.in
-       ${CMAKE_CURRENT_BINARY_DIR}/src/config_spandisc.h)
-include_directories(${CMAKE_CURRENT_BINARY_DIR}/src)
-
-# add source files
-file(GLOB SOURCES src/*.c)
-file(GLOB PUBLIC_HEADER src/*.h)
-message(VERBOSE "Include directory: include")
-include_directories(include)
-
-message(STATUS "Option: BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}")
-if(BUILD_SHARED_LIBS)
-       message(STATUS "Build shared library")
-       add_library(spandisc SHARED ${SOURCES})
-else()
-       message(STATUS "Build static library")
-       add_library(spandisc STATIC ${SOURCES})
-endif()
-
-# set target
-set_target_properties(spandisc PROPERTIES PUBLIC_HEADER "${PUBLIC_HEADER}")
-target_link_libraries(spandisc m)
-
-message(STATUS "Install target spandisc")
-message(VERBOSE "With component libspandisc")
-message(VERBOSE "With component libspandisc-dev")
-
-if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-       install(TARGETS spandisc
-               DESTINATION "${CMAKE_INSTALL_PREFIX}/lib"
-               COMPONENT libspandisc
-               PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_PREFIX}/include"
-               COMPONENT libspandisc-dev)
-elseif (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
-       install(TARGETS spandisc
-               COMPONENT libspandisc
-               COMPONENT libspandisc-dev)
-endif()
-
-################################################################################
-# Build deb Packages
-#
-################################################################################
-
-if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-       set(CPACK_GENERATOR "DEB")
-       set(CPACK_DEB_COMPONENT_INSTALL ON)
-       set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
-       set(CPACK_DEBIAN_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION}")
-       set(CPACK_DEBIAN_PACKAGE_RELEASE "1")
-       set(CPACK_DEBIAN_ARCHITECTURE "amd64")
-       set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Bastian Dehn <hhaalo@arcor.de")
-       set(CPACK_DEBIAN_PACKAGE_PRIORITY "optional")
-       set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://gitweb.hhaalo.de/?p=discspan.git")
-       set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
-       set(CPACK_DEBIAN_PACKAGE_DEPENDS "libspandisc")
-       include(CPackConfig.cmake)
-elseif (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
-       set(CPACK_GENERATOR "ZIP")
-endif()
-
-include(CPack)

diff --git a/libs/spandisc/CPackConfig.cmake b/libs/spandisc/CPackConfig.cmake
deleted file mode 100644 (file)
index 2c1db21..0000000
--- a/libs/spandisc/CPackConfig.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-# libspandisc
-set(CPACK_DEBIAN_LIBSPANDISC_PACKAGE_NAME "libspandisc")
-set(CPACK_DEBIAN_LIBSPANDISC_FILE_NAME "libspandisc_${CPACK_DEBIAN_PACKAGE_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE}_${CPACK_DEBIAN_ARCHITECTURE}.deb")
-set(CPACK_DEBIAN_LIBSPANDISC_DESCRIPTION "library with logic to split many files to media discs")
-SET(CPACK_DEBIAN_LIBSPANDISC_PACKAGE_SECTION "libs")
-
-# libspandisc-dev
-set(CPACK_DEBIAN_LIBSPANDISC-DEV_PACKAGE_NAME "libspandisc-dev")
-set(CPACK_DEBIAN_LIBSPANDISC-DEV_PACKAGE_DEPENDS "libspandisc")
-set(CPACK_DEBIAN_LIBSPANDISC-DEV_FILE_NAME "libspandisc-dev_${CPACK_DEBIAN_PACKAGE_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE}_${CPACK_DEBIAN_ARCHITECTURE}.deb")
-set(CPACK_DEBIAN_LIBSPANDISC-DEV_DESCRIPTION "libspandisc library header files")
-set(CPACK_DEBIAN_LIBSPANDISC-DEV_DEPENDS "libspandisc")
-set(CPACK_DEBIAN_LIBSPANDISC-DEV_PACKAGE_SECTION "devel")

diff --git a/libs/spandisc/src/CMakeLists.txt b/libs/spandisc/src/CMakeLists.txt
new file mode 100644 (file)
index 0000000..a8659e1
--- /dev/null
+++ b/libs/spandisc/src/CMakeLists.txt
@@ -0,0 +1,78 @@
+cmake_minimum_required(VERSION 3.13.4)
+
+project(spandisc)
+
+set(CMAKE_INSTALL_PREFIX "/usr/local" CACHE PATH "Install prefix")
+message(STATUS "CMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}")
+
+set(PROJECT_VERSION_MAJOR 1)
+set(PROJECT_VERSION_MINOR 0)
+set(PROJECT_VERSION_PATCH 0)
+set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
+
+option(BUILD_SHARED_LIBS "build shared libs" ON)
+
+# configure file
+message(STATUS "Generating header: config_spandisc.h")
+configure_file(${CMAKE_CURRENT_LIST_DIR}/config_spandisc.h.in
+       ${CMAKE_CURRENT_BINARY_DIR}/config_spandisc.h)
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+# add source files
+file(GLOB SOURCES *.c)
+file(GLOB PUBLIC_HEADER *.h)
+message(VERBOSE "Include directory: include")
+include_directories(include)
+
+message(STATUS "Option: BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}")
+if(BUILD_SHARED_LIBS)
+       message(STATUS "Build shared library")
+       add_library(spandisc SHARED ${SOURCES})
+else()
+       message(STATUS "Build static library")
+       add_library(spandisc STATIC ${SOURCES})
+endif()
+
+# set target
+set_target_properties(spandisc PROPERTIES PUBLIC_HEADER "${PUBLIC_HEADER}")
+target_link_libraries(spandisc m)
+
+message(STATUS "Install target spandisc")
+message(VERBOSE "With component libspandisc")
+message(VERBOSE "With component libspandisc-dev")
+
+if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+       install(TARGETS spandisc
+               DESTINATION "${CMAKE_INSTALL_PREFIX}/lib"
+               COMPONENT libspandisc
+               PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_PREFIX}/include"
+               COMPONENT libspandisc-dev)
+elseif (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+       install(TARGETS spandisc
+               COMPONENT libspandisc
+               COMPONENT libspandisc-dev)
+endif()
+
+################################################################################
+# Build deb Packages
+#
+################################################################################
+
+if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+       set(CPACK_GENERATOR "DEB")
+       set(CPACK_DEB_COMPONENT_INSTALL ON)
+       set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
+       set(CPACK_DEBIAN_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION}")
+       set(CPACK_DEBIAN_PACKAGE_RELEASE "1")
+       set(CPACK_DEBIAN_ARCHITECTURE "amd64")
+       set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Bastian Dehn <hhaalo@arcor.de")
+       set(CPACK_DEBIAN_PACKAGE_PRIORITY "optional")
+       set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://gitweb.hhaalo.de/?p=discspan.git")
+       set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
+       set(CPACK_DEBIAN_PACKAGE_DEPENDS "libspandisc")
+       include(CPackConfig.cmake)
+elseif (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+       set(CPACK_GENERATOR "ZIP")
+endif()
+
+include(CPack)

diff --git a/libs/spandisc/src/CPackConfig.cmake b/libs/spandisc/src/CPackConfig.cmake
new file mode 100644 (file)
index 0000000..2c1db21
--- /dev/null
+++ b/libs/spandisc/src/CPackConfig.cmake
@@ -0,0 +1,13 @@
+# libspandisc
+set(CPACK_DEBIAN_LIBSPANDISC_PACKAGE_NAME "libspandisc")
+set(CPACK_DEBIAN_LIBSPANDISC_FILE_NAME "libspandisc_${CPACK_DEBIAN_PACKAGE_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE}_${CPACK_DEBIAN_ARCHITECTURE}.deb")
+set(CPACK_DEBIAN_LIBSPANDISC_DESCRIPTION "library with logic to split many files to media discs")
+SET(CPACK_DEBIAN_LIBSPANDISC_PACKAGE_SECTION "libs")
+
+# libspandisc-dev
+set(CPACK_DEBIAN_LIBSPANDISC-DEV_PACKAGE_NAME "libspandisc-dev")
+set(CPACK_DEBIAN_LIBSPANDISC-DEV_PACKAGE_DEPENDS "libspandisc")
+set(CPACK_DEBIAN_LIBSPANDISC-DEV_FILE_NAME "libspandisc-dev_${CPACK_DEBIAN_PACKAGE_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE}_${CPACK_DEBIAN_ARCHITECTURE}.deb")
+set(CPACK_DEBIAN_LIBSPANDISC-DEV_DESCRIPTION "libspandisc library header files")
+set(CPACK_DEBIAN_LIBSPANDISC-DEV_DEPENDS "libspandisc")
+set(CPACK_DEBIAN_LIBSPANDISC-DEV_PACKAGE_SECTION "devel")