blob: 7866eae94264cf50dd08dbb06c06dd9e2ea6deaa (
plain)
1 Submitted By: Igor Živković <contact@igor-zivkovic.from.hr>
2 Date: 2013-10-17
3 Initial Package Version: 2.3.3.4
4 Upstream Status: Reported
5 Origin: Debian
6 Description: Fixed building and installing of contribs-lib if specified by config.
7
8 diff -Naur clucene-2.3.3.4.orig/CMakeLists.txt clucene-2.3.3.4/CMakeLists.txt
9 --- clucene-2.3.3.4.orig/CMakeLists.txt 2013-10-17 11:32:30.064546492 +0200
10 +++ clucene-2.3.3.4/CMakeLists.txt 2013-10-17 11:33:58.559550441 +0200
11 @@ -163,7 +163,7 @@
12 SET(BUILD_CONTRIBS_LIB 1)
13 ENDIF ( BUILD_CONTRIBS )
14 IF ( BUILD_CONTRIBS_LIB )
15 - ADD_SUBDIRECTORY (src/contribs-lib EXCLUDE_FROM_ALL)
16 + ADD_SUBDIRECTORY (src/contribs-lib)
17 ENDIF ( BUILD_CONTRIBS_LIB )
18
19
20 diff -Naur clucene-2.3.3.4.orig/src/contribs-lib/CMakeLists.txt clucene-2.3.3.4/src/contribs-lib/CMakeLists.txt
21 --- clucene-2.3.3.4.orig/src/contribs-lib/CMakeLists.txt 2013-10-17 11:32:30.076546493 +0200
22 +++ clucene-2.3.3.4/src/contribs-lib/CMakeLists.txt 2013-10-17 11:33:58.560550441 +0200
23 @@ -106,9 +106,26 @@
24 )
25 TARGET_LINK_LIBRARIES(clucene-contribs-lib ${clucene_contrib_extra_libs})
26
27 +#install public headers.
28 +FOREACH(file ${HEADERS})
29 + get_filename_component(apath ${file} PATH)
30 + get_filename_component(aname ${file} NAME)
31 + file(RELATIVE_PATH relpath ${CMAKE_SOURCE_DIR}/src/contribs-lib ${apath})
32 + IF ( NOT aname MATCHES "^_.*" )
33 + install(FILES ${file}
34 + DESTINATION include/${relpath}
35 + COMPONENT development)
36 + ENDIF ( NOT aname MATCHES "^_.*" )
37 +ENDFOREACH(file)
38 +
39 #set properties on the libraries
40 SET_TARGET_PROPERTIES(clucene-contribs-lib PROPERTIES
41 VERSION ${CLUCENE_VERSION}
42 SOVERSION ${CLUCENE_SOVERSION}
43 COMPILE_DEFINITIONS_DEBUG _DEBUG
44 )
45 +
46 +#and install library
47 +install(TARGETS clucene-contribs-lib
48 + DESTINATION ${LIB_DESTINATION}
49 + COMPONENT runtime )
|
