diff --git a/CMakeLists.txt b/CMakeLists.txt index 9751ad525..9603d99f4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,6 +15,8 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON) include(GNUInstallDirs) + + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) @@ -486,12 +488,9 @@ endif() ############################################################################### # HEADERS ############################################################################### - install(DIRECTORY include/lvr2 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) list(APPEND LVR2_INSTALL_INCLUDE_DIRS ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}) - - ############################################################################### # VTK use file include. Has to be called after all CUDA code # was generated and compiled. The VTK definitions corrupt the @@ -652,7 +651,7 @@ endif() include(CMakePackageConfigHelpers) set(INCLUDE_INSTALL_DIR include/) -set(LIB_INSTALL_DIR lib/) +set(LIB_INSTALL_DIR lib) set(SYSCONFIG_INSTALL_DIR etc/lvr2/) install(EXPORT lvr2Targets @@ -712,3 +711,5 @@ if( DOXYGEN_FOUND AND DOXYGEN_DOT_FOUND ) WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} COMMENT "Generating API documentation with Doxygen" VERBATIM ) endif( DOXYGEN_FOUND AND DOXYGEN_DOT_FOUND ) + + diff --git a/LVR2Config.cmake.in b/LVR2Config.cmake.in index 85cd6a2aa..aa92103fa 100644 --- a/LVR2Config.cmake.in +++ b/LVR2Config.cmake.in @@ -27,12 +27,16 @@ set(LVR2_DEFINITIONS @LVR2_DEFINITIONS@) find_package(PkgConfig REQUIRED) +set(LVR2_LIB_DIR @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@) + option(LVR2_USE_STATIC_LIBS OFF) if(LVR2_USE_STATIC_LIBS) - find_library(LVR2_LIBRARY NAMES lvr2_static) + # find_library(LVR2_LIBRARY NAMES lvr2_static) + set(LVR2_LIBRARY ${LVR2_LIB_DIR}/liblvr2_static.so) set(LVR2_LIBRARIES ${LVR2_LIBRARY}) else() - find_library(LVR2_LIBRARY NAMES lvr2) + # find_library(LVR2_LIBRARY NAMES lvr2) + set(LVR2_LIBRARY ${LVR2_LIB_DIR}/liblvr2.so) set(LVR2_LIBRARIES ${LVR2_LIBRARY}) endif() diff --git a/package.xml b/package.xml index 9a02a1ebb..ceddd69ad 100644 --- a/package.xml +++ b/package.xml @@ -31,15 +31,11 @@ The Las Vegas Surface Reconstruction Toolkit is an Open Source toolkit to recons libgdal-dev eigen ocl-icd-opencl-dev - libvtk - libvtk-qt boost glut libxi-dev libxmu-dev libhdf5-dev - qtbase5-dev - libqt5-opengl-dev lz4 libopencv-dev yaml-cpp