Merge pull request #1 from simoncblyth/master

switch from hardcoded include to overridable GNUInstallDirs CMAKE_INS…

Author: nemothenoone

share/bcm/cmake/BCMDeploy.cmake

@@ -4,13 +4,18 @@ include(BCMInstallTargets)
 include(BCMExport)
 
 function(bcm_deploy)
-    set(options)
+    set(options SKIP_HEADER_INSTALL)
     set(oneValueArgs NAMESPACE COMPATIBILITY)
     set(multiValueArgs TARGETS INCLUDE)
 
     cmake_parse_arguments(PARSE "${options}" "${oneValueArgs}" "${multiValueArgs}"  ${ARGN})
 
-    bcm_install_targets(TARGETS ${PARSE_TARGETS} INCLUDE ${PARSE_INCLUDE})
+    if(PARSE_SKIP_HEADER_INSTALL)
+        bcm_install_targets(TARGETS ${PARSE_TARGETS} INCLUDE ${PARSE_INCLUDE} SKIP_HEADER_INSTALL)
+    else()
+        bcm_install_targets(TARGETS ${PARSE_TARGETS} INCLUDE ${PARSE_INCLUDE} )
+    endif()
+
     bcm_auto_pkgconfig(TARGET ${PARSE_TARGETS})
     bcm_auto_export(TARGETS ${PARSE_TARGETS} NAMESPACE ${PARSE_NAMESPACE} COMPATIBILITY ${PARSE_COMPATIBILITY})
 
@@ -34,4 +39,4 @@ function(bcm_deploy)
         bcm_shadow_notify(${TARGET})
     endforeach()
 
-endfunction()
+endfunction()

share/bcm/cmake/BCMInstallTargets.cmake

@@ -1,7 +1,7 @@
 include(GNUInstallDirs)
 
 function(bcm_install_targets)
-    set(options)
+    set(options SKIP_HEADER_INSTALL)
     set(oneValueArgs EXPORT)
     set(multiValueArgs TARGETS INCLUDE)
 
@@ -22,12 +22,16 @@ function(bcm_install_targets)
             get_filename_component(INCLUDE_PATH ${INCLUDE} ABSOLUTE)
             target_include_directories(${TARGET} INTERFACE $<BUILD_INTERFACE:${INCLUDE_PATH}>)
         endforeach()
-        target_include_directories(${TARGET} INTERFACE $<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>)
+        target_include_directories(${TARGET} INTERFACE $<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${INCLUDE_INSTALL_DIR}>)
     endforeach()
 
-    foreach(INCLUDE ${PARSE_INCLUDE})
-        install(DIRECTORY ${INCLUDE}/ DESTINATION ${INCLUDE_INSTALL_DIR})
-    endforeach()
+
+    if(NOT PARSE_SKIP_HEADER_INSTALL)
+        message(STATUS "bcm_install_targets.proceed-with-install ${INCLUDE_INSTALL_DIR}  ")
+        foreach(INCLUDE ${PARSE_INCLUDE})
+            install(DIRECTORY ${INCLUDE}/ DESTINATION ${INCLUDE_INSTALL_DIR})
+        endforeach()
+    endif()
 
     install(TARGETS ${PARSE_TARGETS}
             EXPORT ${EXPORT_FILE}

share/bcm/cmake/BCMSetupVersion.cmake

@@ -1,4 +1,4 @@
-
+include(GNUInstallDirs)
 set(BCM_HEADER_VERSION_TEMPLATE_FILE "${CMAKE_CURRENT_LIST_DIR}/version.hpp")
 
 macro(bcm_set_parent VAR)
@@ -46,7 +46,7 @@ function(bcm_setup_version)
 
     if(PARSE_GENERATE_HEADER)
         configure_file("${BCM_HEADER_VERSION_TEMPLATE_FILE}" "${PARSE_GENERATE_HEADER}")
-        install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PARSE_GENERATE_HEADER}" DESTINATION include)
+        install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PARSE_GENERATE_HEADER}" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
     endif()
 
 endfunction()