From e48f64daacb46901352cade2e715ce49b46f9a39 Mon Sep 17 00:00:00 2001 From: solvingj Date: Thu, 14 Sep 2017 12:32:27 -0400 Subject: [PATCH] Remove include directories CMakeLists files * simply consolidate 6 files into 6 lines * narrowed glob on inc and simplified --- CMakeLists.txt | 10 +++++++++- include/CMakeLists.txt | 1 - include/tins/CMakeLists.txt | 10 ---------- include/tins/detail/CMakeLists.txt | 6 ------ include/tins/dot11/CMakeLists.txt | 6 ------ include/tins/tcp_ip/CMakeLists.txt | 6 ------ include/tins/utils/CMakeLists.txt | 6 ------ 7 files changed, 9 insertions(+), 36 deletions(-) delete mode 100644 include/CMakeLists.txt delete mode 100644 include/tins/CMakeLists.txt delete mode 100644 include/tins/detail/CMakeLists.txt delete mode 100644 include/tins/dot11/CMakeLists.txt delete mode 100644 include/tins/tcp_ip/CMakeLists.txt delete mode 100644 include/tins/utils/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 91237ed..1af8b4c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -263,7 +263,6 @@ ADD_CUSTOM_TARGET(uninstall # ****************** # Add subdirectories # ****************** -ADD_SUBDIRECTORY(include) ADD_SUBDIRECTORY(src) IF(LIBTINS_BUILD_EXAMPLES) @@ -343,3 +342,12 @@ INSTALL( DESTINATION CMake COMPONENT dev ) + +#Recursively list of all headers, with paths relative to include/tins +FILE(GLOB_RECURSE INCLUDE_FILES "include/tins/*.h") + +INSTALL( + FILES ${INCLUDE_FILES} + DESTINATION . + COMPONENT Headers +) diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt deleted file mode 100644 index 1d59e55..0000000 --- a/include/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -ADD_SUBDIRECTORY(tins) diff --git a/include/tins/CMakeLists.txt b/include/tins/CMakeLists.txt deleted file mode 100644 index 1b67728..0000000 --- a/include/tins/CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ -FILE(GLOB INCLUDE_FILES "*.h") -INSTALL( - FILES ${INCLUDE_FILES} - DESTINATION include/tins - COMPONENT Headers -) -ADD_SUBDIRECTORY(dot11) -ADD_SUBDIRECTORY(tcp_ip) -ADD_SUBDIRECTORY(detail) -ADD_SUBDIRECTORY(utils) diff --git a/include/tins/detail/CMakeLists.txt b/include/tins/detail/CMakeLists.txt deleted file mode 100644 index 5d57beb..0000000 --- a/include/tins/detail/CMakeLists.txt +++ /dev/null @@ -1,6 +0,0 @@ -FILE(GLOB INCLUDE_FILES "*.h") -INSTALL( - FILES ${INCLUDE_FILES} - DESTINATION include/tins/detail - COMPONENT Headers -) diff --git a/include/tins/dot11/CMakeLists.txt b/include/tins/dot11/CMakeLists.txt deleted file mode 100644 index c736681..0000000 --- a/include/tins/dot11/CMakeLists.txt +++ /dev/null @@ -1,6 +0,0 @@ -FILE(GLOB INCLUDE_FILES "*.h") -INSTALL( - FILES ${INCLUDE_FILES} - DESTINATION include/tins/dot11 - COMPONENT Headers -) diff --git a/include/tins/tcp_ip/CMakeLists.txt b/include/tins/tcp_ip/CMakeLists.txt deleted file mode 100644 index db9c3a7..0000000 --- a/include/tins/tcp_ip/CMakeLists.txt +++ /dev/null @@ -1,6 +0,0 @@ -FILE(GLOB INCLUDE_FILES "*.h") -INSTALL( - FILES ${INCLUDE_FILES} - DESTINATION include/tins/tcp_ip - COMPONENT Headers -) diff --git a/include/tins/utils/CMakeLists.txt b/include/tins/utils/CMakeLists.txt deleted file mode 100644 index 04ddc8b..0000000 --- a/include/tins/utils/CMakeLists.txt +++ /dev/null @@ -1,6 +0,0 @@ -FILE(GLOB INCLUDE_FILES "*.h") -INSTALL( - FILES ${INCLUDE_FILES} - DESTINATION include/tins/utils - COMPONENT Headers -)