wok-next diff clucene/stuff/patches/clucene-2.3.3.4-contribs_lib-1.patch @ rev 21105

Small updates... "bzip2" and "cairo": follow "libpkg - pkg - pkg-dev" rule
author Aleksej Bobylev <al.bobylev@gmail.com>
date Fri Jan 04 17:29:48 2019 +0200 (2019-01-04)
parents
children
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/clucene/stuff/patches/clucene-2.3.3.4-contribs_lib-1.patch	Fri Jan 04 17:29:48 2019 +0200
     1.3 @@ -0,0 +1,49 @@
     1.4 +Submitted By:            Igor Živković <contact@igor-zivkovic.from.hr>
     1.5 +Date:                    2013-10-17
     1.6 +Initial Package Version: 2.3.3.4
     1.7 +Upstream Status:         Reported
     1.8 +Origin:                  Debian
     1.9 +Description:             Fixed building and installing of contribs-lib if specified by config.
    1.10 +
    1.11 +diff -Naur clucene-2.3.3.4.orig/CMakeLists.txt clucene-2.3.3.4/CMakeLists.txt
    1.12 +--- clucene-2.3.3.4.orig/CMakeLists.txt	2013-10-17 11:32:30.064546492 +0200
    1.13 ++++ clucene-2.3.3.4/CMakeLists.txt	2013-10-17 11:33:58.559550441 +0200
    1.14 +@@ -163,7 +163,7 @@
    1.15 +   SET(BUILD_CONTRIBS_LIB 1)
    1.16 + ENDIF ( BUILD_CONTRIBS )
    1.17 + IF ( BUILD_CONTRIBS_LIB )
    1.18 +-  ADD_SUBDIRECTORY (src/contribs-lib EXCLUDE_FROM_ALL)
    1.19 ++  ADD_SUBDIRECTORY (src/contribs-lib)
    1.20 + ENDIF ( BUILD_CONTRIBS_LIB )
    1.21 + 
    1.22 + 
    1.23 +diff -Naur clucene-2.3.3.4.orig/src/contribs-lib/CMakeLists.txt clucene-2.3.3.4/src/contribs-lib/CMakeLists.txt
    1.24 +--- clucene-2.3.3.4.orig/src/contribs-lib/CMakeLists.txt	2013-10-17 11:32:30.076546493 +0200
    1.25 ++++ clucene-2.3.3.4/src/contribs-lib/CMakeLists.txt	2013-10-17 11:33:58.560550441 +0200
    1.26 +@@ -106,9 +106,26 @@
    1.27 + )
    1.28 + TARGET_LINK_LIBRARIES(clucene-contribs-lib ${clucene_contrib_extra_libs})
    1.29 + 
    1.30 ++#install public headers.
    1.31 ++FOREACH(file ${HEADERS})
    1.32 ++	get_filename_component(apath ${file} PATH)
    1.33 ++	get_filename_component(aname ${file} NAME)
    1.34 ++	file(RELATIVE_PATH relpath ${CMAKE_SOURCE_DIR}/src/contribs-lib ${apath})
    1.35 ++	IF ( NOT aname MATCHES "^_.*" )
    1.36 ++		install(FILES ${file} 
    1.37 ++		        DESTINATION include/${relpath}
    1.38 ++		        COMPONENT development)
    1.39 ++	ENDIF ( NOT aname MATCHES "^_.*" )
    1.40 ++ENDFOREACH(file)
    1.41 ++
    1.42 + #set properties on the libraries
    1.43 + SET_TARGET_PROPERTIES(clucene-contribs-lib PROPERTIES
    1.44 +     VERSION ${CLUCENE_VERSION}
    1.45 +     SOVERSION ${CLUCENE_SOVERSION}
    1.46 +     COMPILE_DEFINITIONS_DEBUG _DEBUG
    1.47 + )
    1.48 ++
    1.49 ++#and install library
    1.50 ++install(TARGETS clucene-contribs-lib 
    1.51 ++        DESTINATION ${LIB_DESTINATION}  
    1.52 ++        COMPONENT runtime )