CMake: using SALOME_ACCUMULATE_HEADERS() to populate the complete list of includes...

diff --git a/SalomeGUIConfig.cmake.in b/SalomeGUIConfig.cmake.in
index 8987a92599fec4c7374bfc1e7d6354a99965fa55..3231cd1b6ddc1891a39525fdee826267aa5522be 100644 (file)
--- 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 b9715697e746df96fffc7c6f8a02502de9209783..49028bdb730d637db9267c97e3ffa03b332ac8e7 100644 (file)
--- 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 ca13fca06d11de28b2e460ea2a3bc11358697035..2378d71d2e167053b064918c745c73d780d47845 100644 (file)
--- 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 49fc476d09447fe884296776847debd9ea581a44..5490aa9ae0e43415da4151b974b9827e10dc31f7 100644 (file)
--- 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 b26e154601f95fa5721d598e03aebc2ed5eb1c7c..b2a98adf6fc421b2b953f7c6239b3e23bd99121a 100644 (file)
--- 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}")