Merge pull request #172 from p01arst0rm/cmake-bugfixes

small cmake fixes

Author: alanw

src/config/contrib/CMakeLists.txt

@@ -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()
 
 
@@ -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")

src/config/core/CMakeLists.txt

@@ -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++)

src/contrib/CMakeLists.txt

@@ -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")
 
 
 
@@ -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)
@@ -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)

src/core/CMakeLists.txt

@@ -83,5 +83,5 @@ cotire(lucene++)
 
 
 install(TARGETS lucene++
-  DESTINATION "${LIB_DESTINATION}"
+  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
   COMPONENT runtime)

src/test/CMakeLists.txt

@@ -1,12 +1,6 @@
 project(tester)
 
 
-####################################
-# create test bin target
-####################################
-add_executable(lucene++-tester)
-
-
 ####################################
 # configure GTest
 ####################################
@@ -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})
 
 
 ####################################