Skip to content

Commit f9fde5c

Browse files
committed
Also install the contributions library.
1 parent 18409f2 commit f9fde5c

File tree

3 files changed

+24
-4
lines changed

3 files changed

+24
-4
lines changed

CMakeLists.txt

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ INCLUDE(PCHSupport)
154154
####################################
155155
#include sub-projects
156156
ADD_SUBDIRECTORY (src/core)
157-
ADD_SUBDIRECTORY (src/contrib EXCLUDE_FROM_ALL)
157+
ADD_SUBDIRECTORY (src/contrib)
158158
ADD_SUBDIRECTORY (src/demo EXCLUDE_FROM_ALL)
159159
ADD_SUBDIRECTORY (src/test)
160160

@@ -163,8 +163,14 @@ ADD_SUBDIRECTORY (src/test)
163163
# install pkg-config file
164164
#################################
165165
IF(NOT WIN32)
166-
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/liblucene++.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/liblucene++.pc @ONLY)
167-
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/liblucene++.pc
166+
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/liblucene++.pc.cmake
167+
${CMAKE_CURRENT_BINARY_DIR}/liblucene++.pc @ONLY)
168+
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/liblucene++-contrib.pc.cmake
169+
${CMAKE_CURRENT_BINARY_DIR}/liblucene++-contrib.pc @ONLY)
170+
171+
install(FILES
172+
${CMAKE_CURRENT_BINARY_DIR}/liblucene++.pc
173+
${CMAKE_CURRENT_BINARY_DIR}/liblucene++-contrib.pc
168174
DESTINATION ${LIB_DESTINATION}/pkgconfig )
169175
ENDIF(NOT WIN32)
170176

liblucene++-contrib.pc.cmake

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
prefix=@CMAKE_INSTALL_PREFIX@
2+
exec_prefix=${prefix}/bin
3+
libdir=${prefix}/@LIB_DESTINATION@
4+
includedir=${prefix}/include/lucene++
5+
lib=lucene++-contrib
6+
7+
Name: liblucene++-contrib
8+
Description: Contributions for Lucene++ - a C++ search engine, ported from the popular Apache Lucene
9+
Version: @LUCENE++_VERSION@
10+
Libs: -L${prefix}/@LIB_DESTINATION@/ -l${lib}
11+
Cflags: -I${includedir}
12+
Requires: liblucene++=@LUCENE++_VERSION@
13+
~
14+

src/contrib/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ INCLUDE_DIRECTORIES(${lucene++-contrib_SOURCE_DIR}/include)
1717
INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
1818
LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
1919

20-
install(FILES HEADERS
20+
install(FILES ${HEADERS}
2121
DESTINATION include/lucene++
2222
COMPONENT development-contrib)
2323

0 commit comments

Comments
 (0)