From 7729cc3f87bffca36a9765a4a58b83363d7c306b Mon Sep 17 00:00:00 2001
From: rnv <rnv@opencascade.com>
Date: Mon, 14 Oct 2013 07:37:14 +0000
Subject: [PATCH] Porting CALCULATOR SALOME module build procedure to the CMake
 build system: some corrections:

1) Move module configuration file to the root directory.
2) Remove deprecated files.
---
 CMakeLists.txt                                |  2 +-
 ...cmake.in => SalomeCOMPONENTConfig.cmake.in |  0
 adm_local/cmake_files/CMakeLists.txt          |  1 -
 adm_local/cmake_files/FindCOMPONENT.cmake     | 35 -------------------
 4 files changed, 1 insertion(+), 37 deletions(-)
 rename adm_local/cmake_files/SalomeCOMPONENTConfig.cmake.in => SalomeCOMPONENTConfig.cmake.in (100%)
 delete mode 100644 adm_local/cmake_files/FindCOMPONENT.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dd3f6bc..be30c27 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -152,7 +152,7 @@ EXPORT(TARGETS ${_${PROJECT_NAME}_exposed_targets}
 SET(KERNEL_ROOT_DIR "${KERNEL_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/adm_local/cmake_files/SalomeCOMPONENTConfig.cmake.in b/SalomeCOMPONENTConfig.cmake.in
similarity index 100%
rename from adm_local/cmake_files/SalomeCOMPONENTConfig.cmake.in
rename to SalomeCOMPONENTConfig.cmake.in
diff --git a/adm_local/cmake_files/CMakeLists.txt b/adm_local/cmake_files/CMakeLists.txt
index 428324a..97706cf 100755
--- a/adm_local/cmake_files/CMakeLists.txt
+++ b/adm_local/cmake_files/CMakeLists.txt
@@ -23,7 +23,6 @@
 
 # These files are data, module or lib files
 SET(_adm_data
-  FindCOMPONENT.cmake
   FindSalomeCOMPONENT.cmake
 )
 INSTALL(FILES ${_adm_data} DESTINATION ${SALOME_INSTALL_CMAKE_LOCAL})
diff --git a/adm_local/cmake_files/FindCOMPONENT.cmake b/adm_local/cmake_files/FindCOMPONENT.cmake
deleted file mode 100644
index b18135d..0000000
--- a/adm_local/cmake_files/FindCOMPONENT.cmake
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
-#
-# 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
-#
-#
-
-SET(COMPONENT_CXXFLAGS -I${COMPONENT_ROOT_DIR}/include/salome) # to be removed
-SET(COMPONENT_INCLUDE_DIRS ${COMPONENT_ROOT_DIR}/include/salome)
-
-FIND_LIBRARY(COMPONENT_AddComponentEngine AddComponentEngine ${COMPONENT_ROOT_DIR}/lib/salome)
-FIND_LIBRARY(COMPONENT_AdditionComponentEngine AdditionComponentEngine ${COMPONENT_ROOT_DIR}/lib/salome)
-FIND_LIBRARY(COMPONENT_DataStreamFactoryEngine DataStreamFactoryEngine ${COMPONENT_ROOT_DIR}/lib/salome)
-FIND_LIBRARY(COMPONENT_DivComponentEngine DivComponentEngine ${COMPONENT_ROOT_DIR}/lib/salome)
-FIND_LIBRARY(COMPONENT_MulComponentEngine MulComponentEngine ${COMPONENT_ROOT_DIR}/lib/salome)
-FIND_LIBRARY(COMPONENT_SIGNALSComponentEngine SIGNALSComponentEngine ${COMPONENT_ROOT_DIR}/lib/salome)
-FIND_LIBRARY(COMPONENT_SubComponentEngine SubComponentEngine ${COMPONENT_ROOT_DIR}/lib/salome)
-FIND_LIBRARY(COMPONENT_SyrComponentEngine SyrComponentEngine ${COMPONENT_ROOT_DIR}/lib/salome)
-FIND_LIBRARY(COMPONENT_DynInvoke DynInvoke ${COMPONENT_ROOT_DIR}/lib/salome)
-FIND_LIBRARY(COMPONENT_TypesCheckEngine TypesCheckEngine ${COMPONENT_ROOT_DIR}/lib/salome)
-FIND_LIBRARY(COMPONENT_UndefinedSymbolComponentEngine UndefinedSymbolComponentEngine ${COMPONENT_ROOT_DIR}/lib/salome)
-FIND_LIBRARY(COMPONENT_SalomeIDLCOMPONENT SalomeIDLCOMPONENT ${COMPONENT_ROOT_DIR}/lib/salome)
-- 
2.30.2