From 9fd8af8f490833f2a8629a4f841ec18642d13c91 Mon Sep 17 00:00:00 2001
From: bruneton <bruneton>
Date: Mon, 7 Oct 2013 07:43:26 +0000
Subject: [PATCH] CMake: using SALOME_ACCUMULATE_HEADERS() to populate the
 complete list of includes required by KERNEL header files.

---
 SalomeGUIConfig.cmake.in                     | 1 +
 adm_local/cmake_files/FindSalomeOpenGL.cmake | 3 +++
 adm_local/cmake_files/FindSalomeQt4.cmake    | 2 ++
 adm_local/cmake_files/FindSalomeQwt.cmake    | 2 ++
 adm_local/cmake_files/FindSalomeVTK.cmake    | 2 ++
 5 files changed, 10 insertions(+)

diff --git a/SalomeGUIConfig.cmake.in b/SalomeGUIConfig.cmake.in
index 8987a9259..3231cd1b6 100644
--- a/SalomeGUIConfig.cmake.in
+++ b/SalomeGUIConfig.cmake.in
@@ -43,6 +43,7 @@ SET_AND_CHECK(GUI_ROOT_DIR_EXP "@PACKAGE_CMAKE_INSTALL_PREFIX@")
 
 # Include directories
 SET_AND_CHECK(GUI_INCLUDE_DIRS "${GUI_ROOT_DIR_EXP}/@SALOME_INSTALL_HEADERS@")
+SET(GUI_INCLUDE_DIRS "${GUI_INCLUDE_DIRS};@_SalomeGUI_EXTRA_HEADERS@")
 SET(GUI_DEFINITIONS "@KERNEL_DEFINITIONS@")
 
 #### Now the specificities
diff --git a/adm_local/cmake_files/FindSalomeOpenGL.cmake b/adm_local/cmake_files/FindSalomeOpenGL.cmake
index b9715697e..49028bdb7 100644
--- a/adm_local/cmake_files/FindSalomeOpenGL.cmake
+++ b/adm_local/cmake_files/FindSalomeOpenGL.cmake
@@ -30,3 +30,6 @@ IF(WIN32)
 ENDIF()
 SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(OpenGL OPENGL_INCLUDE_DIR 1)
 #MARK_AS_ADVANCED()
+
+SALOME_ACCUMULATE_HEADERS(OPENGL_INCLUDE_DIR)
+
diff --git a/adm_local/cmake_files/FindSalomeQt4.cmake b/adm_local/cmake_files/FindSalomeQt4.cmake
index ca13fca06..2378d71d2 100644
--- a/adm_local/cmake_files/FindSalomeQt4.cmake
+++ b/adm_local/cmake_files/FindSalomeQt4.cmake
@@ -25,3 +25,5 @@
 #
 SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(Qt4 QT_INCLUDES 2)
 MARK_AS_ADVANCED(QT_QMAKE_EXECUTABLE)
+
+SALOME_ACCUMULATE_HEADERS(QT_INCLUDES)
diff --git a/adm_local/cmake_files/FindSalomeQwt.cmake b/adm_local/cmake_files/FindSalomeQwt.cmake
index 49fc476d0..5490aa9ae 100644
--- a/adm_local/cmake_files/FindSalomeQwt.cmake
+++ b/adm_local/cmake_files/FindSalomeQwt.cmake
@@ -25,3 +25,5 @@
 #
 SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(Qwt QWT_INCLUDE_DIR 1)
 MARK_AS_ADVANCED(QWT_INCLUDE_DIR QWT_LIBRARY)
+
+SALOME_ACCUMULATE_HEADERS(QWT_INCLUDE_DIR)
\ No newline at end of file
diff --git a/adm_local/cmake_files/FindSalomeVTK.cmake b/adm_local/cmake_files/FindSalomeVTK.cmake
index b26e15460..b2a98adf6 100644
--- a/adm_local/cmake_files/FindSalomeVTK.cmake
+++ b/adm_local/cmake_files/FindSalomeVTK.cmake
@@ -51,6 +51,8 @@ ENDIF()
 SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(VTK VTK_INCLUDE_DIRS 2)
 MARK_AS_ADVANCED(VTK_DIR)
 
+SALOME_ACCUMULATE_HEADERS(VTK_INCLUDE_DIRS)
+
 IF(VTK_FOUND)
   MESSAGE(STATUS "VTK version is ${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}")
   #MESSAGE(STATUS "VTK libraries are: ${VTK_LIBRARIES}")
-- 
2.30.2