Update cmake install to avoid conflict with include files

Author: christophe0606

README.md

@@ -159,7 +159,7 @@ Once cmake has generated the makefiles, you can use a GNU Make to build.
 
 ### How to install as a cmake package
 
-CMSIS-DSP can be installed as a cmake package for host builds on Windows, macOS, or Linux. Set `CMAKE_INSTALL_PREFIX` to the folder where the package must be installed. The installed package exports the target `CMSISDSP::CMSISDSP`. Package installation is disabled when `CMSISCORE` is set, since `CMSISCORE` is used for Cortex-M builds normally handled by CMSIS Toolbox or Zephyr.
+CMSIS-DSP can be installed as a cmake package for host builds on Windows, macOS, or Linux. Set `CMAKE_INSTALL_PREFIX` to the folder where the package must be installed. The installed package exports the target `CMSISDSP::CMSISDSP`. Headers are installed below `include/CMSIS-DSP` to avoid conflicts with other packages, but applications still include CMSIS-DSP headers with `#include "arm_math.h"` when linking with `CMSISDSP::CMSISDSP`. Package installation is disabled when `CMSISCORE` is set, since `CMSISCORE` is used for Cortex-M builds normally handled by CMSIS Toolbox or Zephyr.
 
 For maximum performance on an Arm host with Neon, build in `Release`, enable `HOST` and `NEON`, and use `-O3 -ffast-math`:
 

Source/CMakeLists.txt

@@ -29,6 +29,8 @@ else()
   set(CMSISDSP_INSTALL_DEFAULT ON)
 endif()
 option(CMSISDSP_INSTALL "Install CMSIS-DSP and export a CMake package" ${CMSISDSP_INSTALL_DEFAULT})
+set(CMSISDSP_INSTALL_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}/CMSIS-DSP"
+    CACHE STRING "CMSIS-DSP headers install directory")
 
 ###########################
 #
@@ -74,7 +76,7 @@ include(WindowFunctions/Config.cmake)
 ### Includes
 target_include_directories(CMSISDSP PUBLIC
   $<BUILD_INTERFACE:${DSP}/Include>
-  $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+  $<INSTALL_INTERFACE:${CMSISDSP_INSTALL_INCLUDEDIR}>)
 if (DEFINED CMSISCORE)
 target_include_directories(CMSISDSP PUBLIC
   $<BUILD_INTERFACE:${CMSISCORE}/Include>)
@@ -96,16 +98,15 @@ if (CMSISDSP_INSTALL)
     EXPORT CMSISDSPTargets
     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 
   install(DIRECTORY "${DSP}/Include/"
-    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+    DESTINATION ${CMSISDSP_INSTALL_INCLUDEDIR}
     FILES_MATCHING PATTERN "*.h")
 
   if (NEON OR NEONEXPERIMENTAL)
     install(DIRECTORY "${DSP}/ComputeLibrary/Include/"
-      DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+      DESTINATION ${CMSISDSP_INSTALL_INCLUDEDIR}
       FILES_MATCHING PATTERN "*.h")
   endif()
 

Source/configDsp.cmake

@@ -24,7 +24,7 @@ if (NEON)
     # Used in arm_vec_math.h
     target_include_directories(${project} PUBLIC
       $<BUILD_INTERFACE:${DSP}/ComputeLibrary/Include>
-      $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+      $<INSTALL_INTERFACE:${CMSISDSP_INSTALL_INCLUDEDIR}>)
     target_include_directories(${project} PRIVATE "${DSP}/Ne10")
     target_compile_definitions(${project} PUBLIC ARM_MATH_NEON)
 
@@ -34,7 +34,7 @@ if (NEONEXPERIMENTAL)
     # Used in arm_vec_math.h
     target_include_directories(${project} PUBLIC
       $<BUILD_INTERFACE:${DSP}/ComputeLibrary/Include>
-      $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+      $<INSTALL_INTERFACE:${CMSISDSP_INSTALL_INCLUDEDIR}>)
     target_include_directories(${project} PRIVATE "${DSP}/Ne10")
     target_compile_definitions(${project} PUBLIC ARM_MATH_NEON_EXPERIMENTAL)
 endif()

cmake/CMSISDSPConfig.cmake.in

@@ -3,4 +3,4 @@
 include("${CMAKE_CURRENT_LIST_DIR}/CMSISDSPTargets.cmake")
 
 set(CMSISDSP_LIBRARIES CMSISDSP::CMSISDSP)
-set(CMSISDSP_INCLUDE_DIRS "${PACKAGE_PREFIX_DIR}/@CMAKE_INSTALL_INCLUDEDIR@")
+set(CMSISDSP_INCLUDE_DIRS "${PACKAGE_PREFIX_DIR}/@CMSISDSP_INSTALL_INCLUDEDIR@")