mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-28 08:31:59 +00:00
50 lines
1.6 KiB
Diff
50 lines
1.6 KiB
Diff
Description: contribs-lib is not built and installed even with config
|
|
Author: Vitaliy Filippov
|
|
Bug: https://sourceforge.net/tracker/index.php?func=detail&aid=3392466&group_id=80013&atid=558446
|
|
|
|
---
|
|
CMakeLists.txt | 2 +-
|
|
src/contribs-lib/CMakeLists.txt | 17 +++++++++++++++++
|
|
2 files changed, 18 insertions(+), 1 deletion(-)
|
|
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -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 )
|
|
|
|
|
|
--- a/src/contribs-lib/CMakeLists.txt
|
|
+++ b/src/contribs-lib/CMakeLists.txt
|
|
@@ -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 )
|