Replaced FindLibBatch.cmake module with config file libBatchConfig.cmake

diff --git a/misc/CMakeLists.txt b/misc/CMakeLists.txt
index 94332521ccc57d73008881e19db5d5e91e961d59..4711a5690afe377b3d6e7e4d8015a27c6ea8b6d1 100644 (file)
--- a/misc/CMakeLists.txt
+++ b/misc/CMakeLists.txt
@@ -20,5 +20,13 @@
 #  See http://www.salome-platform.org/ or
 #  email : webmaster.salome@opencascade.com
 
-INSTALL(FILES check_libbatch.m4 FindLibBatch.cmake
+INSTALL(FILES check_libbatch.m4
         DESTINATION share/Batch/misc)
+
+GET_TARGET_PROPERTY(LIBBATCH_ABS_PATH Batch LOCATION)
+GET_FILENAME_COMPONENT(LIBBATCH_REAL_NAME ${LIBBATCH_ABS_PATH} NAME)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libBatchConfig.cmake.in
+               ${CMAKE_CURRENT_BINARY_DIR}/libBatchConfig.cmake @ONLY)
+
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libBatchConfig.cmake
+        DESTINATION lib)

diff --git a/misc/FindLibBatch.cmake b/misc/FindLibBatch.cmake
deleted file mode 100644 (file)
index c61c280..0000000
--- a/misc/FindLibBatch.cmake
+++ /dev/null
@@ -1,58 +0,0 @@
-#  Copyright (C) 2007-2010  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
-
-# FindLibBatch
-# This module can be used to find libBatch and set the associated variables in
-# a project based on CMake. You can copy this file in your own project and
-# eventually modify it according to your own needs.
-#-----------------------------------------------------------------------------
-
-IF (NOT LibBatch_FIND_QUIETLY)
-    MESSAGE(STATUS "Looking for libBatch...")
-ENDIF (NOT LibBatch_FIND_QUIETLY)
-
-FIND_PATH(LIBBATCH_INCLUDE_DIR Batch/Batch_BatchManager.hxx)
-FIND_LIBRARY(LIBBATCH_LIBRARY Batch) 
-
-IF (LIBBATCH_INCLUDE_DIR AND LIBBATCH_LIBRARY)
-    SET(LibBatch_FOUND True)
-ENDIF (LIBBATCH_INCLUDE_DIR AND LIBBATCH_LIBRARY)
-
-IF (LibBatch_FOUND)
-
-    IF (NOT LibBatch_FIND_QUIETLY)
-        MESSAGE(STATUS "Found libBatch:")
-        MESSAGE(STATUS "libBatch include directory: ${LIBBATCH_INCLUDE_DIR}")
-        MESSAGE(STATUS "libBatch library: ${LIBBATCH_LIBRARY}")
-    ENDIF (NOT LibBatch_FIND_QUIETLY)
-
-ELSE (LibBatch_FOUND)
-
-    IF (LibBatch_FIND_REQUIRED)
-        MESSAGE(FATAL_ERROR "libBatch not found")
-    ELSE (LibBatch_FIND_REQUIRED)
-        IF (NOT LibBatch_FIND_QUIETLY)
-            MESSAGE(STATUS "libBatch not found")
-        ENDIF (NOT LibBatch_FIND_QUIETLY)
-    ENDIF (LibBatch_FIND_REQUIRED)
-
-ENDIF (LibBatch_FOUND)

diff --git a/misc/libBatchConfig.cmake.in b/misc/libBatchConfig.cmake.in
new file mode 100644 (file)
index 0000000..b8bccaf
--- /dev/null
+++ b/misc/libBatchConfig.cmake.in
@@ -0,0 +1,28 @@
+#  Copyright (C) 2007-2010  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
+
+get_filename_component(SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
+get_filename_component(LIBBATCH_ROOT_DIR "${SELF_DIR}/.." ABSOLUTE)
+set(LIBBATCH_INCLUDE_DIRS "${LIBBATCH_ROOT_DIR}/include/Batch")
+set(LIBBATCH_LIBRARIES "${LIBBATCH_ROOT_DIR}/lib/@LIBBATCH_REAL_NAME@")
+set(LIBBATCH_RUNTIME_LIBRARY_DIRS "${LIBBATCH_ROOT_DIR}/lib")
+set(LIBBATCH_PYTHONPATH "${LIBBATCH_ROOT_DIR}/lib/python@PYTHON_VERSION@/site-packages")