Author: smr
Date: 2015-09-05 03:35:21 +0000 (Sat, 05 Sep 2015)
New Revision: 20030
Added:
trunk/packages/minc/libminc/trunk/debian/patches/fix-uselibminc-cmake
Modified:
trunk/packages/minc/libminc/trunk/debian/patches/series
trunk/packages/minc/libminc/trunk/debian/rules
Log:
Fix filename of UseLIBMINC.cmake.
Added: trunk/packages/minc/libminc/trunk/debian/patches/fix-uselibminc-cmake
===================================================================
--- trunk/packages/minc/libminc/trunk/debian/patches/fix-uselibminc-cmake
(rev 0)
+++ trunk/packages/minc/libminc/trunk/debian/patches/fix-uselibminc-cmake
2015-09-05 03:35:21 UTC (rev 20030)
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2f23bf1..03a6468 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -418,7 +418,7 @@ configure_file(UseLIBMINC.cmake.in
+ ${CMAKE_CURRENT_BINARY_DIR}/UseLIBMINC.cmake @ONLY)
+
+ # config for install dir
+-SET(LIBMINC_USE_FILE_CONFIG
"${CMAKE_INSTALL_PREFIX}/${LIBMINC_INSTALL_LIB_DIR}/Use${LIBMINC_EXTERNAL_LIB_PREFIX}LIBMINC.cmake")
++SET(LIBMINC_USE_FILE_CONFIG
"${CMAKE_INSTALL_PREFIX}/${LIBMINC_INSTALL_LIB_DIR}/cmake/LIBMINC/Use${LIBMINC_EXTERNAL_LIB_PREFIX}LIBMINC.cmake")
+ SET(LIBMINC_INCLUDE_DIRS_CONFIG
${CMAKE_INSTALL_PREFIX}/${LIBMINC_INSTALL_INCLUDE_DIR} )
+ SET(LIBMINC_LIBRARY_DIRS_CONFIG
${CMAKE_INSTALL_PREFIX}/${LIBMINC_INSTALL_LIB_DIR})
+ SET(LIBMINC_STATIC_LIBRARIES_CONFIG "")
Modified: trunk/packages/minc/libminc/trunk/debian/patches/series
===================================================================
--- trunk/packages/minc/libminc/trunk/debian/patches/series 2015-09-05
03:32:57 UTC (rev 20029)
+++ trunk/packages/minc/libminc/trunk/debian/patches/series 2015-09-05
03:35:21 UTC (rev 20030)
@@ -1,2 +1,3 @@
build-using-system-find-dot-cmake
fix-soversion-generation
+fix-uselibminc-cmake
Modified: trunk/packages/minc/libminc/trunk/debian/rules
===================================================================
--- trunk/packages/minc/libminc/trunk/debian/rules 2015-09-05 03:32:57 UTC
(rev 20029)
+++ trunk/packages/minc/libminc/trunk/debian/rules 2015-09-05 03:35:21 UTC
(rev 20030)
@@ -3,9 +3,6 @@
ARCH = $(shell dpkg-architecture -qDEB_TARGET_MULTIARCH)
-%:
- dh $@
-
CMAKE_FLAGS = \
-DLIB_SUFFIX=/$(ARCH) \
-DBUILD_TESTING:BOOL=ON \
@@ -13,6 +10,9 @@
-DLIBMINC_BUILD_SHARED_LIBS:BOOL=ON \
-DLIBMINC_MINC1_SUPPORT:BOOL=ON
+%:
+ dh $@
+
override_dh_auto_configure:
rm -f cmake-modules/*HDF5*
dh_auto_configure -- $(CMAKE_FLAGS)
@@ -20,6 +20,6 @@
override_dh_install:
dh_install -plibminc2-4.0.0 --autodest debian/tmp/usr/lib/*/lib*.so.*
dh_install -plibminc-dev --autodest debian/tmp/usr/lib/*/lib*.so
- dh_install -plibminc-dev debian/tmp/usr/lib/*/*.cmake
/usr/lib/$(ARCH)/cmake/minc
+ dh_install -plibminc-dev debian/tmp/usr/lib/*/*.cmake
/usr/lib/$(ARCH)/cmake/LIBMINC
dh_install -plibminc-dev --autodest debian/tmp/usr/include
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
