Tidy up the include dir

* Move contents of include/CMakeLists.txt to the root CMakeLists.txt

Signed-off-by: Martin Stump <martin.stump@mercedes-benz.com>

CMakeLists.txt

@@ -53,19 +53,92 @@ else()
   endif()
 endif()
 
+# Fetch dependencies
 include(CPM)
+CPMAddPackage(
+  NAME units
+  GITHUB_REPOSITORY nholthaus/units
+  GIT_TAG v2.3.3
+  VERSION 2.3.3
+  OPTIONS "DISABLE_PREDEFINED_UNITS ON"
+          "ENABLE_PREDEFINED_ACCELERATION_UNITS ON"
+          "ENABLE_PREDEFINED_ANGLE_UNITS ON"
+          "ENABLE_PREDEFINED_ANGULAR_VELOCITY_UNITS ON"
+          "ENABLE_PREDEFINED_CONCENTRATION_UNITS ON"
+          "ENABLE_PREDEFINED_FORCE_UNITS ON"
+          "ENABLE_PREDEFINED_LENGTH_UNITS ON"
+          "ENABLE_PREDEFINED_MASS_UNITS ON"
+          "ENABLE_PREDEFINED_PRESSURE_UNITS ON"
+          "ENABLE_PREDEFINED_TEMPERATURE_UNITS ON"
+          "ENABLE_PREDEFINED_TIME_UNITS ON"
+          "ENABLE_PREDEFINED_VELOCITY_UNITS ON"
+)
+
+# Add library
+file(
+  GLOB_RECURSE HEADERS
+  RELATIVE ${PROJECT_SOURCE_DIR}/include
+  CONFIGURE_DEPENDS "*.h"
+)
+
+add_library(MantleAPI INTERFACE)
+add_library(MantleAPI::MantleAPI ALIAS MantleAPI)
+
+target_link_libraries(MantleAPI INTERFACE units::units)
+
+include(GNUInstallDirs)
+set(INSTALL_CONFIG_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/MantleAPI")
+
+target_include_directories(
+  MantleAPI INTERFACE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include> $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+)
 
-add_subdirectory(include)
+target_compile_features(MantleAPI INTERFACE cxx_std_17)
+
+# Configure export
+include(CMakePackageConfigHelpers)
+configure_package_config_file(
+  "${PROJECT_SOURCE_DIR}/cmake/MantleAPIConfig.cmake.in" "${PROJECT_BINARY_DIR}/MantleAPIConfig.cmake"
+  INSTALL_DESTINATION ${INSTALL_CONFIG_DIR}
+  PATH_VARS CMAKE_INSTALL_INCLUDEDIR
+)
+
+write_basic_package_version_file(
+  "${PROJECT_BINARY_DIR}/MantleAPIConfigVersion.cmake"
+  VERSION ${PROJECT_VERSION}
+  COMPATIBILITY SameMajorVersion
+)
+
+# Configure install
+if(MantleAPI_INSTALL)
+  install(DIRECTORY include/ TYPE INCLUDE)
+  install(TARGETS MantleAPI EXPORT MantleAPITargets)
+
+  install(
+    EXPORT MantleAPITargets
+    DESTINATION ${INSTALL_CONFIG_DIR}
+    NAMESPACE MantleAPI::
+  )
+
+  install(
+    FILES "${PROJECT_BINARY_DIR}/MantleAPIConfig.cmake" "${PROJECT_BINARY_DIR}/MantleAPIConfigVersion.cmake"
+    DESTINATION ${INSTALL_CONFIG_DIR}
+    COMPONENT dev
+  )
+endif()
 
+# Build docs
 if(MantleAPI_DOC)
   add_subdirectory(doc)
 endif()
 
+# Build tests
 if(MantleAPI_TEST)
   enable_testing()
   add_subdirectory(test)
 endif()
 
+# Configure package
 if(MantleAPI_PACKAGE)
   include(MantleAPICPack)
 endif()

include/CMakeLists.txt

-################################################################################
-# Copyright (c) 2021 Daimler TSS GmbH
-# Copyright (c) 2022 Mercedes-Benz Tech Innovation GmbH
-#
-# This program and the accompanying materials are made available under the terms
-# of the Eclipse Public License 2.0 which is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-################################################################################
-
-CPMAddPackage(
-  NAME units
-  GITHUB_REPOSITORY nholthaus/units
-  GIT_TAG v2.3.3
-  VERSION 2.3.3
-  OPTIONS "DISABLE_PREDEFINED_UNITS ON"
-          "ENABLE_PREDEFINED_ACCELERATION_UNITS ON"
-          "ENABLE_PREDEFINED_ANGLE_UNITS ON"
-          "ENABLE_PREDEFINED_ANGULAR_VELOCITY_UNITS ON"
-          "ENABLE_PREDEFINED_CONCENTRATION_UNITS ON"
-          "ENABLE_PREDEFINED_FORCE_UNITS ON"
-          "ENABLE_PREDEFINED_LENGTH_UNITS ON"
-          "ENABLE_PREDEFINED_MASS_UNITS ON"
-          "ENABLE_PREDEFINED_PRESSURE_UNITS ON"
-          "ENABLE_PREDEFINED_TEMPERATURE_UNITS ON"
-          "ENABLE_PREDEFINED_TIME_UNITS ON"
-          "ENABLE_PREDEFINED_VELOCITY_UNITS ON"
-)
-
-file(
-  GLOB_RECURSE HEADERS
-  RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-  CONFIGURE_DEPENDS "*.h"
-)
-
-add_library(MantleAPI INTERFACE)
-add_library(MantleAPI::MantleAPI ALIAS MantleAPI)
-
-target_link_libraries(MantleAPI INTERFACE units::units)
-
-include(GNUInstallDirs)
-set(INSTALL_CONFIG_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/MantleAPI")
-
-target_include_directories(
-  MantleAPI INTERFACE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include> $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
-)
-
-target_compile_features(MantleAPI INTERFACE cxx_std_17)
-
-include(CMakePackageConfigHelpers)
-configure_package_config_file(
-  "${PROJECT_SOURCE_DIR}/cmake/MantleAPIConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/MantleAPIConfig.cmake"
-  INSTALL_DESTINATION ${INSTALL_CONFIG_DIR}
-  PATH_VARS CMAKE_INSTALL_INCLUDEDIR
-)
-
-write_basic_package_version_file(
-  "${CMAKE_CURRENT_BINARY_DIR}/MantleAPIConfigVersion.cmake"
-  VERSION ${PROJECT_VERSION}
-  COMPATIBILITY SameMajorVersion
-)
-
-if(MantleAPI_INSTALL)
-  install(DIRECTORY MantleAPI TYPE INCLUDE)
-  install(TARGETS MantleAPI EXPORT MantleAPITargets)
-
-  install(
-    EXPORT MantleAPITargets
-    DESTINATION ${INSTALL_CONFIG_DIR}
-    NAMESPACE MantleAPI::
-  )
-
-  install(
-    FILES "${CMAKE_CURRENT_BINARY_DIR}/MantleAPIConfig.cmake" "${CMAKE_CURRENT_BINARY_DIR}/MantleAPIConfigVersion.cmake"
-    DESTINATION ${INSTALL_CONFIG_DIR}
-    COMPONENT dev
-  )
-endif()