From 926942e881afb17a1e097479cdf38f6d7ea2e233 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Thu, 25 Apr 2013 15:54:56 -0500
Subject: [svn-r23629] HDFFV-8368: Merge removal of include sub-folders from
 trunk

---
 c++/src/CMakeLists.txt        | 2 +-
 fortran/src/CMakeLists.txt    | 6 +++---
 hl/c++/src/CMakeLists.txt     | 2 +-
 hl/fortran/src/CMakeLists.txt | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt
index 033fc12..dd8d35b 100644
--- a/c++/src/CMakeLists.txt
+++ b/c++/src/CMakeLists.txt
@@ -94,7 +94,7 @@ INSTALL (
     FILES
         ${CPP_HDRS}
     DESTINATION
-        ${HDF5_INSTALL_INCLUDE_DIR}/cpp
+        ${HDF5_INSTALL_INCLUDE_DIR}
     COMPONENT
         cppheaders
 )
diff --git a/fortran/src/CMakeLists.txt b/fortran/src/CMakeLists.txt
index c41916a..1bddc56 100644
--- a/fortran/src/CMakeLists.txt
+++ b/fortran/src/CMakeLists.txt
@@ -254,7 +254,7 @@ INSTALL (
         ${HDF5_F90_BINARY_DIR}/H5f90i_gen.h
         ${HDF5_F90_BINARY_DIR}/H5fortran_types.f90
     DESTINATION 
-        ${HDF5_INSTALL_INCLUDE_DIR}/fortran 
+        ${HDF5_INSTALL_INCLUDE_DIR}
     COMPONENT 
         fortheaders
 )
@@ -264,7 +264,7 @@ IF (WIN32 AND NOT CYGWIN)
       DIRECTORY
           ${CMAKE_Fortran_MODULE_DIRECTORY}/\${BUILD_TYPE}/
       DESTINATION
-          ${HDF5_INSTALL_INCLUDE_DIR}/fortran
+          ${HDF5_INSTALL_INCLUDE_DIR}
       COMPONENT
           fortheaders
   )
@@ -273,7 +273,7 @@ ELSE (WIN32 AND NOT CYGWIN)
       DIRECTORY
           ${CMAKE_Fortran_MODULE_DIRECTORY}/
       DESTINATION
-          ${HDF5_INSTALL_INCLUDE_DIR}/fortran
+          ${HDF5_INSTALL_INCLUDE_DIR}
       COMPONENT
           fortheaders
   )
diff --git a/hl/c++/src/CMakeLists.txt b/hl/c++/src/CMakeLists.txt
index 5a2a7c4..89de4ca 100644
--- a/hl/c++/src/CMakeLists.txt
+++ b/hl/c++/src/CMakeLists.txt
@@ -27,7 +27,7 @@ INSTALL (
     FILES
         ${HDF5_HL_CPP_HDRS}
     DESTINATION
-        ${HDF5_INSTALL_INCLUDE_DIR}/hl/cpp
+        ${HDF5_INSTALL_INCLUDE_DIR}
     COMPONENT
         hlcppheaders
 )
diff --git a/hl/fortran/src/CMakeLists.txt b/hl/fortran/src/CMakeLists.txt
index c580516..9ab0fb2 100644
--- a/hl/fortran/src/CMakeLists.txt
+++ b/hl/fortran/src/CMakeLists.txt
@@ -76,7 +76,7 @@ IF (WIN32 AND NOT CYGWIN)
       DIRECTORY
           ${CMAKE_Fortran_MODULE_DIRECTORY}/\${BUILD_TYPE}/
       DESTINATION
-          ${HDF5_INSTALL_INCLUDE_DIR}/fortran
+          ${HDF5_INSTALL_INCLUDE_DIR}
       COMPONENT
           fortheaders
   )
@@ -85,7 +85,7 @@ ELSE (WIN32 AND NOT CYGWIN)
       DIRECTORY
           ${CMAKE_Fortran_MODULE_DIRECTORY}/
       DESTINATION
-          ${HDF5_INSTALL_INCLUDE_DIR}/fortran
+          ${HDF5_INSTALL_INCLUDE_DIR}
       COMPONENT
           fortheaders
   )
-- 
cgit v0.12