[palabos] 01/03: Install cmake-files in a version-indepenent place.

[Anton Gladky]

This is an automated email from the git hooks/post-receive script.

gladk pushed a commit to branch master
in repository palabos.

commit aa7edc9f494757ecfd1837bf9ad82cc251661588
Author: Anton Gladky <gladk at debian.org>
Date:   Wed Oct 21 22:25:29 2015 +0200

    Install cmake-files in a version-indepenent place.
---
 debian/libplb-dev.install         |  2 +-
 debian/patches/10_add_cmake.patch | 27 ++++++++++++++++-----------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/debian/libplb-dev.install b/debian/libplb-dev.install
index dd7944b..684f681 100644
--- a/debian/libplb-dev.install
+++ b/debian/libplb-dev.install
@@ -1,3 +1,3 @@
 usr/include
 usr/lib/*/libplb.so
-usr/share
+usr/lib/*/cmake
diff --git a/debian/patches/10_add_cmake.patch b/debian/patches/10_add_cmake.patch
index 99f0115..7849ee6 100644
--- a/debian/patches/10_add_cmake.patch
+++ b/debian/patches/10_add_cmake.patch
@@ -2,11 +2,11 @@ Description: Add cmake files
 Author: Anton Gladky <gladk at debian.org>
 Last-Update: 2015-03-28
 
-Index: palabos-1.5.1/CMakeLists.txt
+Index: palabos-v1.5r1/CMakeLists.txt
 ===================================================================
 --- /dev/null
-+++ palabos-1.5.1/CMakeLists.txt
-@@ -0,0 +1,80 @@
++++ palabos-v1.5r1/CMakeLists.txt
+@@ -0,0 +1,85 @@
 +# ENABLE_MPI: enable MPI-modules (ON by default)
 +# ENABLE_POSIX: use POSIX (ON by default)
 +# ENABLE_SMP_PARALLEL: use SMP_PARALLEL (ON by default)
@@ -84,13 +84,18 @@ Index: palabos-1.5.1/CMakeLists.txt
 +
 +ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/src")
 +
-+INSTALL(FILES cMake/FindPalabos.cmake cMake/FindTinyXML.cmake
-+  DESTINATION ${CMAKE_INSTALL_PREFIX}/share/cmake-3.0/Modules
++INSTALL(FILES cMake/FindTinyXML.cmake
++  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/TinyXML
++  RENAME TinyXMLConfig.cmake
 +  )
-Index: palabos-1.5.1/cMake/FindPalabos.cmake
++INSTALL(FILES cMake/FindPalabos.cmake
++  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Palabos
++  RENAME PalabosConfig.cmake
++  )
+Index: palabos-v1.5r1/cMake/FindPalabos.cmake
 ===================================================================
 --- /dev/null
-+++ palabos-1.5.1/cMake/FindPalabos.cmake
++++ palabos-v1.5r1/cMake/FindPalabos.cmake
 @@ -0,0 +1,26 @@
 +# Try to find the Palabos librairies
 +#  PALABOS_FOUND - system has GMP lib
@@ -118,10 +123,10 @@ Index: palabos-1.5.1/cMake/FindPalabos.cmake
 +INCLUDE(FindPackageHandleStandardArgs)
 +FIND_PACKAGE_HANDLE_STANDARD_ARGS(Palabos DEFAULT_MSG PALABOS_INCLUDE_DIR PALABOS_LIBRARIES)
 +MARK_AS_ADVANCED( PALABOS_INCLUDE_DIR PALABOS_LIBRARIES )
-Index: palabos-1.5.1/cMake/FindTinyXML.cmake
+Index: palabos-v1.5r1/cMake/FindTinyXML.cmake
 ===================================================================
 --- /dev/null
-+++ palabos-1.5.1/cMake/FindTinyXML.cmake
++++ palabos-v1.5r1/cMake/FindTinyXML.cmake
 @@ -0,0 +1,26 @@
 +# - Find TinyXML
 +# Find the native TinyXML includes and library
@@ -149,10 +154,10 @@ Index: palabos-1.5.1/cMake/FindTinyXML.cmake
 +FIND_PACKAGE_HANDLE_STANDARD_ARGS( "TinyXML" DEFAULT_MSG TINYXML_INCLUDE_DIR TINYXML_LIBRARIES )
 +
 +MARK_AS_ADVANCED( TINYXML_INCLUDE_DIR TINYXML_LIBRARIES )
-Index: palabos-1.5.1/src/CMakeLists.txt
+Index: palabos-v1.5r1/src/CMakeLists.txt
 ===================================================================
 --- /dev/null
-+++ palabos-1.5.1/src/CMakeLists.txt
++++ palabos-v1.5r1/src/CMakeLists.txt
 @@ -0,0 +1,26 @@
 +FILE(GLOB_RECURSE SRC_FILES_SRC "*.cpp")
 +

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/palabos.git