Skip to content

small cmake fixes #172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 26, 2021
Merged

small cmake fixes #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/config/contrib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ if(NOT WIN32)
install(
FILES
"${CMAKE_CURRENT_BINARY_DIR}/liblucene++-contrib.pc"
DESTINATION "${LIB_DESTINATION}/pkgconfig")
DESTINATION {${CMAKE_INSTALL_LIBDIR}/pkgconfig)
endif()


Expand All @@ -31,4 +31,4 @@ install(
FILES
"${CMAKE_CURRENT_BINARY_DIR}/liblucene++-contribConfig.cmake"
"${CMAKE_CURRENT_BINARY_DIR}/liblucene++-contribConfigVersion.cmake"
DESTINATION "${LIB_DESTINATION}/cmake/liblucene++-contrib")
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/liblucene++-contrib")
2 changes: 1 addition & 1 deletion src/config/core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ install(
FILES
"${CMAKE_CURRENT_BINARY_DIR}/liblucene++Config.cmake"
"${CMAKE_CURRENT_BINARY_DIR}/liblucene++ConfigVersion.cmake"
DESTINATION "${LIB_DESTINATION}/cmake/liblucene++")
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/liblucene++)
12 changes: 5 additions & 7 deletions src/contrib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,8 @@ file(GLOB_RECURSE contrib_sources
"snowball/libstemmer_c/runtime/*.c"
)

file(GLOB_RECURSE contrib_headers
"${lucene++-lib_SOURCE_DIR}/include/*.h"
)
file(GLOB_RECURSE contrib_headers
"${lucene++-lib_SOURCE_DIR}/include/*.h")



Expand Down Expand Up @@ -64,8 +63,7 @@ target_link_libraries(lucene++-contrib
Boost::system
Boost::thread
ZLIB::ZLIB
lucene++::lucene++
)
lucene++::lucene++)

if(WIN32)
target_link_libraries(lucene++-contrib ws2_32)
Expand All @@ -88,10 +86,10 @@ set_target_properties(lucene++-contrib
cotire(lucene++-contrib)

install(TARGETS lucene++-contrib
DESTINATION "${LIB_DESTINATION}"
DESTINATION ${CMAKE_INSTALL_LIBDIR}
COMPONENT runtime)

install(
FILES ${contrib_headers}
DESTINATION "include/lucene++"
LIBRARY DESTINATION "include/lucene++"
COMPONENT development-contrib)
2 changes: 1 addition & 1 deletion src/core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,5 +83,5 @@ cotire(lucene++)


install(TARGETS lucene++
DESTINATION "${LIB_DESTINATION}"
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
COMPONENT runtime)
16 changes: 6 additions & 10 deletions src/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
project(tester)


####################################
# create test bin target
####################################
add_executable(lucene++-tester)


####################################
# configure GTest
####################################
Expand All @@ -32,11 +26,13 @@ file(GLOB_RECURSE tester_sources
"util/*.cpp")

file(GLOB_RECURSE test_headers
"${lucene++-tester_SOURCE_DIR}/include/*.h")
"${lucene++-tester_SOURCE_DIR}/include/*.h")

target_sources(lucene++-tester
PRIVATE
${tester_sources})
####################################
# create test bin target
####################################
add_executable(lucene++-tester
${tester_sources})


####################################
Expand Down