From 42c87870eb57be49f8183c568e35d3aa3ce894eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Lemoine?= Date: Tue, 24 Jan 2017 16:56:41 +0100 Subject: [PATCH] Fix build issues (#123) --- CMakeLists.txt | 2 ++ lib/CMakeLists.txt | 2 +- pgsql/CMakeLists.txt | 6 ------ 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fc3fabc..2dd1bb7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -112,12 +112,14 @@ find_package (LibGHT) if (LIBGHT_FOUND) set (HAVE_LIBGHT 1) + include_directories (${LIBGHT_INCLUDE_DIR}) endif (LIBGHT_FOUND) find_package (LazPerf) if (LAZPERF_FOUND) set (HAVE_LAZPERF 1) + include_directories (${LAZPERF_INCLUDE_DIR}) endif (LAZPERF_FOUND) #------------------------------------------------------------------------------ diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index a255ef6..b84e352 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -54,7 +54,7 @@ target_link_libraries (libpc-static xml2) target_link_libraries (libpc-static z) target_link_libraries (libpc-static m) if (LIBGHT_FOUND) - target_link_libraries (libpc-static ght) + target_link_libraries (libpc-static ${LIBGHT_LIBRARY}) endif (LIBGHT_FOUND) if (LAZPERF_FOUND) target_link_libraries (libpc-static liblazperf-static) diff --git a/pgsql/CMakeLists.txt b/pgsql/CMakeLists.txt index 8b7231c..ffe2e2a 100644 --- a/pgsql/CMakeLists.txt +++ b/pgsql/CMakeLists.txt @@ -34,12 +34,6 @@ include_directories ("${PROJECT_SOURCE_DIR}/lib") add_library (pointcloud MODULE ${PC_SOURCES} ${PC_HEADERS}) target_link_libraries (pointcloud libpc-static) -target_link_libraries (pointcloud xml2) -target_link_libraries (pointcloud z) - -if (LIBGHT_FOUND) - target_link_libraries (pointcloud ght) -endif (LIBGHT_FOUND) set_target_properties (pointcloud PROPERTIES OUTPUT_NAME "pointcloud-${POINTCLOUD_VERSION_MAJOR}"