public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in media-libs/lensfun/files: lensfun-0.2.8-r1-build.patch
@ 2014-07-20 18:17 Markus Meier (maekke)
  0 siblings, 0 replies; only message in thread
From: Markus Meier (maekke) @ 2014-07-20 18:17 UTC (permalink / raw
  To: gentoo-commits

maekke      14/07/20 18:17:10

  Added:                lensfun-0.2.8-r1-build.patch
  Log:
  do not modify header file install destination path by disposable in bug #500696, drop python2.6 support
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 072AD062)

Revision  Changes    Path
1.1                  media-libs/lensfun/files/lensfun-0.2.8-r1-build.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/lensfun/files/lensfun-0.2.8-r1-build.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/lensfun/files/lensfun-0.2.8-r1-build.patch?rev=1.1&content-type=text/plain

Index: lensfun-0.2.8-r1-build.patch
===================================================================
diff -ru lensfun-0.2.8.orig/CMakeLists.txt lensfun-0.2.8/CMakeLists.txt
--- lensfun-0.2.8.orig/CMakeLists.txt	2013-12-18 23:15:40.496926617 +0100
+++ lensfun-0.2.8/CMakeLists.txt	2013-12-18 23:18:12.289679316 +0100
@@ -74,14 +74,9 @@
  
 # define destination dirs (relative to prefix)
 SET(BINDIR bin CACHE PATH "Directory for library example programs")
-SET(LIBDIR lib${LIB_SUFFIX} CACHE PATH "Directory for library itself")
 SET(INCLUDEDIR include CACHE PATH "Directory for library header files")
 SET(DATADIR share/lensfun CACHE PATH "Directory for library data files")
 
-IF(BUILD_DOC)
-  SET(DOCDIR share/doc/lensfun-${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_MICRO}.${VERSION_BUGFIX} CACHE PATH "Directory to put library documentation in")
-ENDIF(BUILD_DOC)
-
 IF(WIN32)
   # install into place in build-dir  
   SET(LENSFUN_INSTALL_PREFIX "${SOURCE_BASE_DIR}/lensfun" CACHE PATH "Install prefix for lensfun")    
diff -ru lensfun-0.2.8.orig/docs/CMakeLists.txt lensfun-0.2.8/docs/CMakeLists.txt
--- lensfun-0.2.8.orig/docs/CMakeLists.txt	2013-12-18 23:15:40.496926617 +0100
+++ lensfun-0.2.8/docs/CMakeLists.txt	2013-12-18 23:19:27.578052651 +0100
@@ -20,4 +20,4 @@
 )
 
 # install documentation  
-INSTALL(DIRECTORY ${CMAKE_DOC_OUT}/ DESTINATION ${DOCDIR})
+INSTALL(DIRECTORY "${CMAKE_BINARY_DIR}/doc_doxygen/" DESTINATION ${DOCDIR})





^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2014-07-20 18:17 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-07-20 18:17 [gentoo-commits] gentoo-x86 commit in media-libs/lensfun/files: lensfun-0.2.8-r1-build.patch Markus Meier (maekke)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox