File tree Expand file tree Collapse file tree 3 files changed +24
-4
lines changed Expand file tree Collapse file tree 3 files changed +24
-4
lines changed Original file line number Diff line number Diff line change @@ -154,7 +154,7 @@ INCLUDE(PCHSupport)
154154####################################
155155#include sub-projects
156156ADD_SUBDIRECTORY (src/core)
157- ADD_SUBDIRECTORY (src/contrib EXCLUDE_FROM_ALL )
157+ ADD_SUBDIRECTORY (src/contrib)
158158ADD_SUBDIRECTORY (src/demo EXCLUDE_FROM_ALL )
159159ADD_SUBDIRECTORY (src/test )
160160
@@ -163,8 +163,14 @@ ADD_SUBDIRECTORY (src/test)
163163# install pkg-config file
164164#################################
165165IF (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 )
169175ENDIF (NOT WIN32 )
170176
Original file line number Diff line number Diff line change 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+
Original file line number Diff line number Diff line change @@ -17,7 +17,7 @@ INCLUDE_DIRECTORIES(${lucene++-contrib_SOURCE_DIR}/include)
1717INCLUDE_DIRECTORIES (${Boost_INCLUDE_DIRS} )
1818LINK_DIRECTORIES (${Boost_LIBRARY_DIRS} )
1919
20- install (FILES HEADERS
20+ install (FILES ${ HEADERS}
2121 DESTINATION include /lucene++
2222 COMPONENT development-contrib)
2323
You can’t perform that action at this time.
0 commit comments