From: bruneton <bruneton>
Date: Mon, 7 Oct 2013 07:27:25 +0000 (+0000)
Subject: Moving config file to root dir
X-Git-Tag: BR_hydro_v_0_3_1~52
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b73eed3d41643529ce75f9b1f1ac35d5ddf3bbe9;p=modules%2Fgui.git

Moving config file to root dir
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3c2d6dae2..53d9f4a57 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -242,7 +242,7 @@ SET(VTK_ROOT_DIR "${VTK_ROOT_DIR}")
 SET(QWT_ROOT_DIR "${QWT_ROOT_DIR}")
  
 SET(CONF_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/include" "${PROJECT_BINARY_DIR}/include")
-CONFIGURE_PACKAGE_CONFIG_FILE(adm_local/cmake_files/${PROJECT_NAME}Config.cmake.in 
+CONFIGURE_PACKAGE_CONFIG_FILE(${PROJECT_NAME}Config.cmake.in 
     ${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
     INSTALL_DESTINATION "${SALOME_INSTALL_CMAKE_LOCAL}"
     PATH_VARS CONF_INCLUDE_DIRS SALOME_INSTALL_CMAKE_LOCAL CMAKE_INSTALL_PREFIX
diff --git a/SalomeGUIConfig.cmake.in b/SalomeGUIConfig.cmake.in
new file mode 100644
index 000000000..8987a9259
--- /dev/null
+++ b/SalomeGUIConfig.cmake.in
@@ -0,0 +1,164 @@
+# - Config file for the @PROJECT_NAME@ package
+# It defines the following variables. 
+# Specific to the pacakge @PROJECT_NAME@ itself:
+#  @PROJECT_NAME_UC@_ROOT_DIR_EXP - the root path of the installation providing this CMake file
+#
+
+###############################################################
+#  Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+#  See http://www.salome-platform.org/ or
+#  email : webmaster.salome@opencascade.com
+###############################################################
+
+### Initialisation performed by CONFIGURE_PACKAGE_CONFIG_FILE:
+@PACKAGE_INIT@
+
+# Load the dependencies for the libraries of @PROJECT_NAME@ 
+# (contains definitions for IMPORTED targets). This is only 
+# imported if we are not built as a subproject (in this case targets are already there)
+IF(NOT TARGET Event AND NOT @PROJECT_NAME@_BINARY_DIR)
+  INCLUDE("@PACKAGE_SALOME_INSTALL_CMAKE_LOCAL@/@PROJECT_NAME@Targets.cmake")
+ENDIF()   
+
+# Package root dir:
+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_DEFINITIONS "@KERNEL_DEFINITIONS@")
+
+#### Now the specificities
+
+# Options exported by the package:
+SET(SALOME_BUILD_DOC   @SALOME_BUILD_DOC@)
+SET(SALOME_BUILD_TESTS @SALOME_BUILD_TESTS@)
+SET(SALOME_LIGHT_ONLY  @SALOME_LIGHT_ONLY@)
+
+# Advanced options
+SET(SALOME_USE_OCCVIEWER    @SALOME_USE_OCCVIEWER@)
+SET(SALOME_USE_GLVIEWER     @SALOME_USE_GLVIEWER@)
+SET(SALOME_USE_VTKVIEWER    @SALOME_USE_VTKVIEWER@)
+SET(SALOME_USE_PLOT2DVIEWER @SALOME_USE_PLOT2DVIEWER@)
+
+# Level 1 prerequisites:
+SET_AND_CHECK(KERNEL_ROOT_DIR_EXP "@PACKAGE_KERNEL_ROOT_DIR@")
+SET_AND_CHECK(SIP_ROOT_DIR_EXP "@PACKAGE_SIP_ROOT_DIR@")
+SET_AND_CHECK(QT4_ROOT_DIR_EXP "@PACKAGE_QT4_ROOT_DIR@")
+SET_AND_CHECK(PYQT4_ROOT_DIR_EXP "@PACKAGE_PYQT4_ROOT_DIR@")
+
+# Optional level 1 prerequisites:
+IF(SALOME_USE_OCCVIEWER)
+  SET_AND_CHECK(CAS_ROOT_DIR_EXP "@PACKAGE_CAS_ROOT_DIR@")    
+ENDIF()
+IF(SALOME_USE_GLVIEWER)
+  SET_AND_CHECK(OPENGL_ROOT_DIR_EXP "@PACKAGE_OPENGL_ROOT_DIR@") 
+ENDIF()
+IF(SALOME_USE_VTKVIEWER) 
+  SET_AND_CHECK(VTK_ROOT_DIR_EXP "@PACKAGE_VTK_ROOT_DIR@")
+ENDIF()
+IF(SALOME_USE_PLOT2DVIEWER)
+  SET_AND_CHECK(QWT_ROOT_DIR_EXP "@PACKAGE_QWT_ROOT_DIR@")
+ENDIF()
+
+# For all prerequisites, load the corresponding targets if the package was used 
+# in CONFIG mode. This ensures dependent projects link correctly
+# without having to set LD_LIBRARY_PATH:
+SET(_PREREQ CAS OpenGL PyQt4 Qt4 Qwt SIP VTK)
+SET(_PREREQ_CONFIG_DIR "@CAS_DIR@" "@OpenGL_DIR@" "@PyQt4_DIR@" "@Qt4_DIR@" "@Qwt_DIR@" "@SIP_DIR@" "@VTK_DIR@")
+LIST(LENGTH _PREREQ_CONFIG_DIR _list_len)
+# Another CMake stupidity - FOREACH(... RANGE r) generates r+1 numbers ...
+MATH(EXPR _range "${_list_len}-1")
+FOREACH(_p RANGE ${_range})  
+  LIST(GET _PREREQ            ${_p} _pkg    )
+  LIST(GET _PREREQ_CONFIG_DIR ${_p} _pkg_dir)
+  IF(_pkg_dir)
+     MESSAGE(STATUS "===> Reloading targets from ${_pkg} ...")
+     FIND_PACKAGE(${_pkg} REQUIRED NO_MODULE 
+          PATHS "${_pkg_dir}" 
+          NO_DEFAULT_PATH)
+  ENDIF()
+ENDFOREACH()
+
+# Installation directories
+SET(SALOME_INSTALL_BINS "@SALOME_INSTALL_BINS@")
+SET(SALOME_INSTALL_LIBS "@SALOME_INSTALL_LIBS@")
+SET(SALOME_INSTALL_IDLS "@SALOME_INSTALL_IDLS@")
+SET(SALOME_INSTALL_HEADERS "@SALOME_INSTALL_HEADERS@")
+SET(SALOME_INSTALL_SCRIPT_SCRIPTS "@SALOME_INSTALL_SCRIPT_SCRIPTS@")
+SET(SALOME_INSTALL_SCRIPT_DATA "@SALOME_INSTALL_SCRIPT_DATA@")
+SET(SALOME_INSTALL_SCRIPT_PYTHON "@SALOME_INSTALL_SCRIPT_PYTHON@")
+SET(SALOME_INSTALL_APPLISKEL_SCRIPTS "@SALOME_INSTALL_APPLISKEL_SCRIPTS@")
+SET(SALOME_INSTALL_APPLISKEL_PYTHON "@SALOME_INSTALL_APPLISKEL_PYTHON@") 
+SET(SALOME_INSTALL_CMAKE "@SALOME_INSTALL_CMAKE@")
+SET(SALOME_INSTALL_CMAKE_LOCAL "@SALOME_INSTALL_CMAKE_LOCAL@")
+SET(SALOME_INSTALL_PYTHON "@SALOME_INSTALL_PYTHON@")
+SET(SALOME_INSTALL_PYTHON_SHARED "@SALOME_INSTALL_PYTHON_SHARED@")
+SET(SALOME_INSTALL_RES "@SALOME_INSTALL_RES@")
+SET(SALOME_INSTALL_DOC "@SALOME_INSTALL_DOC@")
+SET(SALOME_INSTALL_AMCONFIG_LOCAL "@SALOME_INSTALL_AMCONFIG_LOCAL@")
+
+# Include KERNEL targets if they were not already loaded:
+IF(NOT (TARGET SALOMEBasics)) 
+  INCLUDE("${KERNEL_ROOT_DIR_EXP}/${SALOME_INSTALL_CMAKE}/SalomeKERNELTargets.cmake")
+ENDIF()
+
+# Exposed GUI targets:
+SET(GUI_caf caf)
+SET(GUI_CAM CAM)
+SET(GUI_CASCatch CASCatch)
+SET(GUI_DDS DDS)
+SET(GUI_Event Event)
+SET(GUI_GLViewer GLViewer)
+SET(GUI_LightApp LightApp)
+SET(GUI_LogWindow LogWindow)
+SET(GUI_ObjBrowser ObjBrowser)
+SET(GUI_OCCViewer OCCViewer)
+SET(GUI_OpenGLUtils OpenGLUtils)
+SET(GUI_Plot2d Plot2d)
+SET(GUI_PyConsole PyConsole)
+SET(GUI_PyInterp PyInterp)
+SET(GUI_QDS QDS)
+SET(GUI_qtx qtx)
+SET(GUI_QxScene QxScene)
+SET(GUI_SalomeApp SalomeApp)
+SET(GUI_SalomeIDLGUI SalomeIDLGUI)
+SET(GUI_SalomeObject SalomeObject)
+SET(GUI_SalomePrs SalomePrs)
+SET(GUI_SalomePyQtGUILight SalomePyQtGUILight)
+SET(GUI_SalomePyQtGUI SalomePyQtGUI)
+SET(GUI_SalomePyQt SalomePyQt)
+SET(GUI_SalomePy SalomePy)
+SET(GUI_SalomeSession SalomeSession)
+SET(GUI_SalomeStyle SalomeStyle)
+SET(GUI_SOCC SOCC)
+SET(GUI_SPlot2d SPlot2d)
+SET(GUI_std std)
+SET(GUI_SUITApp SUITApp)
+SET(GUI_suit suit)
+SET(GUI_SVTK SVTK)
+SET(GUI_ToolsGUI ToolsGUI)
+SET(GUI_ViewerTools ViewerTools)
+SET(GUI_VTKViewer VTKViewer)
+SET(GUI_vtkEDFOverloads vtkEDFOverloads)
+SET(GUI_vtkTools vtkTools)
+SET(GUI_SalomeGuiHelpers SalomeGuiHelpers)
+SET(GUI_SalomeTreeData SalomeTreeData)
+
diff --git a/adm_local/cmake_files/SalomeGUIConfig.cmake.in b/adm_local/cmake_files/SalomeGUIConfig.cmake.in
deleted file mode 100644
index 8987a9259..000000000
--- a/adm_local/cmake_files/SalomeGUIConfig.cmake.in
+++ /dev/null
@@ -1,164 +0,0 @@
-# - Config file for the @PROJECT_NAME@ package
-# It defines the following variables. 
-# Specific to the pacakge @PROJECT_NAME@ itself:
-#  @PROJECT_NAME_UC@_ROOT_DIR_EXP - the root path of the installation providing this CMake file
-#
-
-###############################################################
-#  Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
-#
-#  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-#
-#  This library is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Lesser General Public
-#  License as published by the Free Software Foundation; either
-#  version 2.1 of the License.
-#
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Lesser General Public License for more details.
-#
-#  You should have received a copy of the GNU Lesser General Public
-#  License along with this library; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-#  See http://www.salome-platform.org/ or
-#  email : webmaster.salome@opencascade.com
-###############################################################
-
-### Initialisation performed by CONFIGURE_PACKAGE_CONFIG_FILE:
-@PACKAGE_INIT@
-
-# Load the dependencies for the libraries of @PROJECT_NAME@ 
-# (contains definitions for IMPORTED targets). This is only 
-# imported if we are not built as a subproject (in this case targets are already there)
-IF(NOT TARGET Event AND NOT @PROJECT_NAME@_BINARY_DIR)
-  INCLUDE("@PACKAGE_SALOME_INSTALL_CMAKE_LOCAL@/@PROJECT_NAME@Targets.cmake")
-ENDIF()   
-
-# Package root dir:
-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_DEFINITIONS "@KERNEL_DEFINITIONS@")
-
-#### Now the specificities
-
-# Options exported by the package:
-SET(SALOME_BUILD_DOC   @SALOME_BUILD_DOC@)
-SET(SALOME_BUILD_TESTS @SALOME_BUILD_TESTS@)
-SET(SALOME_LIGHT_ONLY  @SALOME_LIGHT_ONLY@)
-
-# Advanced options
-SET(SALOME_USE_OCCVIEWER    @SALOME_USE_OCCVIEWER@)
-SET(SALOME_USE_GLVIEWER     @SALOME_USE_GLVIEWER@)
-SET(SALOME_USE_VTKVIEWER    @SALOME_USE_VTKVIEWER@)
-SET(SALOME_USE_PLOT2DVIEWER @SALOME_USE_PLOT2DVIEWER@)
-
-# Level 1 prerequisites:
-SET_AND_CHECK(KERNEL_ROOT_DIR_EXP "@PACKAGE_KERNEL_ROOT_DIR@")
-SET_AND_CHECK(SIP_ROOT_DIR_EXP "@PACKAGE_SIP_ROOT_DIR@")
-SET_AND_CHECK(QT4_ROOT_DIR_EXP "@PACKAGE_QT4_ROOT_DIR@")
-SET_AND_CHECK(PYQT4_ROOT_DIR_EXP "@PACKAGE_PYQT4_ROOT_DIR@")
-
-# Optional level 1 prerequisites:
-IF(SALOME_USE_OCCVIEWER)
-  SET_AND_CHECK(CAS_ROOT_DIR_EXP "@PACKAGE_CAS_ROOT_DIR@")    
-ENDIF()
-IF(SALOME_USE_GLVIEWER)
-  SET_AND_CHECK(OPENGL_ROOT_DIR_EXP "@PACKAGE_OPENGL_ROOT_DIR@") 
-ENDIF()
-IF(SALOME_USE_VTKVIEWER) 
-  SET_AND_CHECK(VTK_ROOT_DIR_EXP "@PACKAGE_VTK_ROOT_DIR@")
-ENDIF()
-IF(SALOME_USE_PLOT2DVIEWER)
-  SET_AND_CHECK(QWT_ROOT_DIR_EXP "@PACKAGE_QWT_ROOT_DIR@")
-ENDIF()
-
-# For all prerequisites, load the corresponding targets if the package was used 
-# in CONFIG mode. This ensures dependent projects link correctly
-# without having to set LD_LIBRARY_PATH:
-SET(_PREREQ CAS OpenGL PyQt4 Qt4 Qwt SIP VTK)
-SET(_PREREQ_CONFIG_DIR "@CAS_DIR@" "@OpenGL_DIR@" "@PyQt4_DIR@" "@Qt4_DIR@" "@Qwt_DIR@" "@SIP_DIR@" "@VTK_DIR@")
-LIST(LENGTH _PREREQ_CONFIG_DIR _list_len)
-# Another CMake stupidity - FOREACH(... RANGE r) generates r+1 numbers ...
-MATH(EXPR _range "${_list_len}-1")
-FOREACH(_p RANGE ${_range})  
-  LIST(GET _PREREQ            ${_p} _pkg    )
-  LIST(GET _PREREQ_CONFIG_DIR ${_p} _pkg_dir)
-  IF(_pkg_dir)
-     MESSAGE(STATUS "===> Reloading targets from ${_pkg} ...")
-     FIND_PACKAGE(${_pkg} REQUIRED NO_MODULE 
-          PATHS "${_pkg_dir}" 
-          NO_DEFAULT_PATH)
-  ENDIF()
-ENDFOREACH()
-
-# Installation directories
-SET(SALOME_INSTALL_BINS "@SALOME_INSTALL_BINS@")
-SET(SALOME_INSTALL_LIBS "@SALOME_INSTALL_LIBS@")
-SET(SALOME_INSTALL_IDLS "@SALOME_INSTALL_IDLS@")
-SET(SALOME_INSTALL_HEADERS "@SALOME_INSTALL_HEADERS@")
-SET(SALOME_INSTALL_SCRIPT_SCRIPTS "@SALOME_INSTALL_SCRIPT_SCRIPTS@")
-SET(SALOME_INSTALL_SCRIPT_DATA "@SALOME_INSTALL_SCRIPT_DATA@")
-SET(SALOME_INSTALL_SCRIPT_PYTHON "@SALOME_INSTALL_SCRIPT_PYTHON@")
-SET(SALOME_INSTALL_APPLISKEL_SCRIPTS "@SALOME_INSTALL_APPLISKEL_SCRIPTS@")
-SET(SALOME_INSTALL_APPLISKEL_PYTHON "@SALOME_INSTALL_APPLISKEL_PYTHON@") 
-SET(SALOME_INSTALL_CMAKE "@SALOME_INSTALL_CMAKE@")
-SET(SALOME_INSTALL_CMAKE_LOCAL "@SALOME_INSTALL_CMAKE_LOCAL@")
-SET(SALOME_INSTALL_PYTHON "@SALOME_INSTALL_PYTHON@")
-SET(SALOME_INSTALL_PYTHON_SHARED "@SALOME_INSTALL_PYTHON_SHARED@")
-SET(SALOME_INSTALL_RES "@SALOME_INSTALL_RES@")
-SET(SALOME_INSTALL_DOC "@SALOME_INSTALL_DOC@")
-SET(SALOME_INSTALL_AMCONFIG_LOCAL "@SALOME_INSTALL_AMCONFIG_LOCAL@")
-
-# Include KERNEL targets if they were not already loaded:
-IF(NOT (TARGET SALOMEBasics)) 
-  INCLUDE("${KERNEL_ROOT_DIR_EXP}/${SALOME_INSTALL_CMAKE}/SalomeKERNELTargets.cmake")
-ENDIF()
-
-# Exposed GUI targets:
-SET(GUI_caf caf)
-SET(GUI_CAM CAM)
-SET(GUI_CASCatch CASCatch)
-SET(GUI_DDS DDS)
-SET(GUI_Event Event)
-SET(GUI_GLViewer GLViewer)
-SET(GUI_LightApp LightApp)
-SET(GUI_LogWindow LogWindow)
-SET(GUI_ObjBrowser ObjBrowser)
-SET(GUI_OCCViewer OCCViewer)
-SET(GUI_OpenGLUtils OpenGLUtils)
-SET(GUI_Plot2d Plot2d)
-SET(GUI_PyConsole PyConsole)
-SET(GUI_PyInterp PyInterp)
-SET(GUI_QDS QDS)
-SET(GUI_qtx qtx)
-SET(GUI_QxScene QxScene)
-SET(GUI_SalomeApp SalomeApp)
-SET(GUI_SalomeIDLGUI SalomeIDLGUI)
-SET(GUI_SalomeObject SalomeObject)
-SET(GUI_SalomePrs SalomePrs)
-SET(GUI_SalomePyQtGUILight SalomePyQtGUILight)
-SET(GUI_SalomePyQtGUI SalomePyQtGUI)
-SET(GUI_SalomePyQt SalomePyQt)
-SET(GUI_SalomePy SalomePy)
-SET(GUI_SalomeSession SalomeSession)
-SET(GUI_SalomeStyle SalomeStyle)
-SET(GUI_SOCC SOCC)
-SET(GUI_SPlot2d SPlot2d)
-SET(GUI_std std)
-SET(GUI_SUITApp SUITApp)
-SET(GUI_suit suit)
-SET(GUI_SVTK SVTK)
-SET(GUI_ToolsGUI ToolsGUI)
-SET(GUI_ViewerTools ViewerTools)
-SET(GUI_VTKViewer VTKViewer)
-SET(GUI_vtkEDFOverloads vtkEDFOverloads)
-SET(GUI_vtkTools vtkTools)
-SET(GUI_SalomeGuiHelpers SalomeGuiHelpers)
-SET(GUI_SalomeTreeData SalomeTreeData)
-