From 6c9163dc082ccbe2af2227f397c064ddcfad7c2c Mon Sep 17 00:00:00 2001 From: Bastian Dehn Date: Sun, 14 Sep 2025 15:21:43 +0200 Subject: [PATCH] move cmake files for lib into src --- CMakeLists.txt | 4 ++-- libs/spandisc/{ => src}/CMakeLists.txt | 12 ++++++------ libs/spandisc/{ => src}/CPackConfig.cmake | 0 3 files changed, 8 insertions(+), 8 deletions(-) rename libs/spandisc/{ => src}/CMakeLists.txt (88%) rename libs/spandisc/{ => src}/CPackConfig.cmake (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9cbb069..d93f83e 100644 --- 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/src/CMakeLists.txt similarity index 88% rename from libs/spandisc/CMakeLists.txt rename to libs/spandisc/src/CMakeLists.txt index 7b16242..a8659e1 100644 --- a/libs/spandisc/CMakeLists.txt +++ b/libs/spandisc/src/CMakeLists.txt @@ -13,14 +13,14 @@ set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT 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) +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 src/*.c) -file(GLOB PUBLIC_HEADER src/*.h) +file(GLOB SOURCES *.c) +file(GLOB PUBLIC_HEADER *.h) message(VERBOSE "Include directory: include") include_directories(include) diff --git a/libs/spandisc/CPackConfig.cmake b/libs/spandisc/src/CPackConfig.cmake similarity index 100% rename from libs/spandisc/CPackConfig.cmake rename to libs/spandisc/src/CPackConfig.cmake -- 2.47.3