diff --git a/Source/kwsys/CMakeLists.txt b/Source/kwsys/CMakeLists.txt
index b3febd2f5..3710a649a 100644
--- a/Source/kwsys/CMakeLists.txt
+++ b/Source/kwsys/CMakeLists.txt
@@ -170,6 +170,14 @@ IF(COMMAND INSTALL)
       "${KWSYS_LIBRARY_INSTALL_DIR}")
   ENDIF(NOT KWSYS_INSTALL_BIN_DIR)
 
+  # Setup header install rules.
+  SET(KWSYS_INSTALL_INCLUDE_OPTIONS)
+  IF(KWSYS_INSTALL_COMPONENT_NAME_DEVELOPMENT)
+    SET(KWSYS_INSTALL_INCLUDE_OPTIONS ${KWSYS_INSTALL_INCLUDE_OPTIONS}
+      COMPONENT ${KWSYS_INSTALL_COMPONENT_NAME_DEVELOPMENT}
+      )
+  ENDIF(KWSYS_INSTALL_COMPONENT_NAME_DEVELOPMENT)
+
   # Setup library install rules.
   SET(KWSYS_INSTALL_LIBRARY_RULE)
   IF(KWSYS_INSTALL_LIB_DIR)
@@ -530,7 +538,8 @@ FOREACH(header
                    @ONLY IMMEDIATE)
     IF(KWSYS_INSTALL_INCLUDE_DIR)
       INSTALL(FILES ${KWSYS_HEADER_DIR}/stl/${header}.hxx
-        DESTINATION ${KWSYS_INSTALL_INCLUDE_DIR}/${KWSYS_NAMESPACE}/stl)
+        DESTINATION ${KWSYS_INSTALL_INCLUDE_DIR}/${KWSYS_NAMESPACE}/stl
+        ${KWSYS_INSTALL_INCLUDE_OPTIONS})
     ENDIF(KWSYS_INSTALL_INCLUDE_DIR)
     IF(KWSYS_HEADER_INSTALL_DIR)
       INSTALL_FILES(${KWSYS_HEADER_INSTALL_DIR}/${KWSYS_NAMESPACE}/stl
@@ -546,7 +555,8 @@ FOREACH(header
   # Create an install target for the header wrapper.
   IF(KWSYS_INSTALL_INCLUDE_DIR)
     INSTALL(FILES ${KWSYS_HEADER_DIR}/stl/${header}
-      DESTINATION ${KWSYS_INSTALL_INCLUDE_DIR}/${KWSYS_NAMESPACE}/stl)
+      DESTINATION ${KWSYS_INSTALL_INCLUDE_DIR}/${KWSYS_NAMESPACE}/stl
+      ${KWSYS_INSTALL_INCLUDE_OPTIONS})
   ENDIF(KWSYS_INSTALL_INCLUDE_DIR)
   IF(KWSYS_HEADER_INSTALL_DIR)
     INSTALL_FILES(${KWSYS_HEADER_INSTALL_DIR}/${KWSYS_NAMESPACE}/stl
@@ -571,7 +581,8 @@ FOREACH(header iostream fstream sstream iosfwd)
   # Create an install target for the header wrapper.
   IF(KWSYS_INSTALL_INCLUDE_DIR)
     INSTALL(FILES ${KWSYS_HEADER_DIR}/ios/${header}
-      DESTINATION ${KWSYS_INSTALL_INCLUDE_DIR}/${KWSYS_NAMESPACE}/ios)
+      DESTINATION ${KWSYS_INSTALL_INCLUDE_DIR}/${KWSYS_NAMESPACE}/ios
+      ${KWSYS_INSTALL_INCLUDE_OPTIONS})
   ENDIF(KWSYS_INSTALL_INCLUDE_DIR)
   IF(KWSYS_HEADER_INSTALL_DIR)
     INSTALL_FILES(${KWSYS_HEADER_INSTALL_DIR}/${KWSYS_NAMESPACE}/ios
@@ -669,7 +680,8 @@ FOREACH(c ${KWSYS_CLASSES})
   # Create an install target for the header.
   IF(KWSYS_INSTALL_INCLUDE_DIR)
     INSTALL(FILES ${KWSYS_HEADER_DIR}/${c}.hxx
-      DESTINATION ${KWSYS_INSTALL_INCLUDE_DIR}/${KWSYS_NAMESPACE})
+      DESTINATION ${KWSYS_INSTALL_INCLUDE_DIR}/${KWSYS_NAMESPACE}
+      ${KWSYS_INSTALL_INCLUDE_OPTIONS})
   ENDIF(KWSYS_INSTALL_INCLUDE_DIR)
   IF(KWSYS_HEADER_INSTALL_DIR)
     INSTALL_FILES(${KWSYS_HEADER_INSTALL_DIR}/${KWSYS_NAMESPACE}
@@ -686,7 +698,8 @@ FOREACH(h ${KWSYS_H_FILES})
   # Create an install target for the header.
   IF(KWSYS_INSTALL_INCLUDE_DIR)
     INSTALL(FILES ${KWSYS_HEADER_DIR}/${h}.h
-      DESTINATION ${KWSYS_INSTALL_INCLUDE_DIR}/${KWSYS_NAMESPACE})
+      DESTINATION ${KWSYS_INSTALL_INCLUDE_DIR}/${KWSYS_NAMESPACE}
+      ${KWSYS_INSTALL_INCLUDE_OPTIONS})
   ENDIF(KWSYS_INSTALL_INCLUDE_DIR)
   IF(KWSYS_HEADER_INSTALL_DIR)
     INSTALL_FILES(${KWSYS_HEADER_INSTALL_DIR}/${KWSYS_NAMESPACE}
@@ -703,7 +716,8 @@ FOREACH(h ${KWSYS_HXX_FILES})
   # Create an install target for the header.
   IF(KWSYS_INSTALL_INCLUDE_DIR)
     INSTALL(FILES ${KWSYS_HEADER_DIR}/${h}.hxx
-      DESTINATION ${KWSYS_INSTALL_INCLUDE_DIR}/${KWSYS_NAMESPACE})
+      DESTINATION ${KWSYS_INSTALL_INCLUDE_DIR}/${KWSYS_NAMESPACE}
+      ${KWSYS_INSTALL_INCLUDE_OPTIONS})
   ENDIF(KWSYS_INSTALL_INCLUDE_DIR)
   IF(KWSYS_HEADER_INSTALL_DIR)
     INSTALL_FILES(${KWSYS_HEADER_INSTALL_DIR}/${KWSYS_NAMESPACE}