From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Igor Živković Date: Thu, 17 Oct 2013 00:00:00 +0000 Subject: [PATCH] Fix build and install of contribs-lib if specified by config. Origin: Debian Upstream Status: Reported [ismael@sourcemage.org: Normalised the patch] --- CMakeLists.txt | 2 +- src/contribs-lib/CMakeLists.txt | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff -Naur a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -163,7 +163,7 @@ 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 -Naur a/src/contribs-lib/CMakeLists.txt b/src/contribs-lib/CMakeLists.txt --- a/src/contribs-lib/CMakeLists.txt 2013-10-17 11:32:30.076546493 +0200 +++ b/src/contribs-lib/CMakeLists.txt 2013-10-17 11:33:58.560550441 +0200 @@ -106,9 +106,26 @@ ) 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 )