diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2018-08-19 03:38:17 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2018-08-19 03:38:17 +0000 |
| commit | cb6f083b369ee59de217c0504d471124d533325d (patch) | |
| tree | 28e404754d754f3a852831d2b649010f70695e01 /user/clucene/install_contribs_lib.patch | |
| parent | 7ef2ed32d3d4442463f39d31380cff9432608231 (diff) | |
| parent | c5975fc819d7b79180a3627a87974da9d18685e3 (diff) | |
| download | packages-cb6f083b369ee59de217c0504d471124d533325d.tar.gz packages-cb6f083b369ee59de217c0504d471124d533325d.tar.bz2 packages-cb6f083b369ee59de217c0504d471124d533325d.tar.xz packages-cb6f083b369ee59de217c0504d471124d533325d.zip | |
Merge branch 'libreoffice' into 'master'
LibreOffice and dependencies
I have made a deal with Satan.
See merge request !44
Diffstat (limited to 'user/clucene/install_contribs_lib.patch')
| -rw-r--r-- | user/clucene/install_contribs_lib.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/user/clucene/install_contribs_lib.patch b/user/clucene/install_contribs_lib.patch new file mode 100644 index 000000000..8fbb3c716 --- /dev/null +++ b/user/clucene/install_contribs_lib.patch @@ -0,0 +1,42 @@ +diff -NaurpBb clucene-core-2.3.3.4/CMakeLists.txt clucene-core-2.3.3.4-mod/CMakeLists.txt +--- clucene-core-2.3.3.4/CMakeLists.txt 2011-03-17 03:21:07.000000000 +0300 ++++ clucene-core-2.3.3.4-mod/CMakeLists.txt 2011-08-16 16:56:55.968268152 +0400 +@@ -163,7 +163,7 @@ IF ( BUILD_CONTRIBS ) + SET(BUILD_CONTRIBS_LIB 1) + ENDIF ( BUILD_CONTRIBS ) + IF ( BUILD_CONTRIBS_LIB ) +- ADD_SUBDIRECTORY (src/contribs-lib EXCLUDE_FROM_ALL) ++ ADD_SUBDIRECTORY (src/contribs-lib) + ENDIF ( BUILD_CONTRIBS_LIB ) + + +diff -NaurpBb clucene-core-2.3.3.4/src/contribs-lib/CMakeLists.txt clucene-core-2.3.3.4-mod/src/contribs-lib/CMakeLists.txt +--- clucene-core-2.3.3.4/src/contribs-lib/CMakeLists.txt 2011-03-17 03:21:07.000000000 +0300 ++++ clucene-core-2.3.3.4-mod/src/contribs-lib/CMakeLists.txt 2011-08-16 17:14:13.499275499 +0400 +@@ -106,9 +106,26 @@ add_library(clucene-contribs-lib SHARED + ) + TARGET_LINK_LIBRARIES(clucene-contribs-lib ${clucene_contrib_extra_libs}) + ++#install public headers. ++FOREACH(file ${HEADERS}) ++ get_filename_component(apath ${file} PATH) ++ get_filename_component(aname ${file} NAME) ++ file(RELATIVE_PATH relpath ${CMAKE_SOURCE_DIR}/src/contribs-lib ${apath}) ++ IF ( NOT aname MATCHES "^_.*" ) ++ install(FILES ${file} ++ DESTINATION include/${relpath} ++ COMPONENT development) ++ ENDIF ( NOT aname MATCHES "^_.*" ) ++ENDFOREACH(file) ++ + #set properties on the libraries + SET_TARGET_PROPERTIES(clucene-contribs-lib PROPERTIES + VERSION ${CLUCENE_VERSION} + SOVERSION ${CLUCENE_SOVERSION} + COMPILE_DEFINITIONS_DEBUG _DEBUG + ) ++ ++#and install library ++install(TARGETS clucene-contribs-lib ++ DESTINATION ${LIB_DESTINATION} ++ COMPONENT runtime ) |