Skip to content

Commit 8d8ba89

Browse files
committed
fix compiling and linking
1 parent a9df47f commit 8d8ba89

2 files changed

Lines changed: 6 additions & 3 deletions

File tree

cmake/Using/UseLamure.cmake

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@ MACRO(USE_LAMURE)
55
RETURN()
66
ENDIF((NOT LAMURE_FOUND) AND (${ARGC} LESS 1))
77
COVISE_FIND_PACKAGE(SCHISM)
8-
MESSAGE(${SCHISM_LIBRARIES})
9-
COVISE_FIND_PACKAGE(FREEIMAGE)
10-
MESSAGE(${FREEIMAGE_LIBRARIES})
8+
COVISE_FIND_PACKAGE(Freetype)
119
IF(NOT LAMURE_USED AND LAMURE_FOUND)
1210
SET(LAMURE_USED TRUE)
1311
INCLUDE_DIRECTORIES(SYSTEM ${LAMURE_INCLUDE_DIR} ${SCHISM_INCLUDE_DIRS})
1412
SET(EXTRA_LIBS ${EXTRA_LIBS} ${LAMURE_LIBRARIES})
1513
SET(EXTRA_LIBS ${EXTRA_LIBS} ${SCHISM_LIBRARIES})
14+
IF(FREETYPE_FOUND)
15+
SET(EXTRA_LIBS ${EXTRA_LIBS} ${FREETYPE_LIBRARIES})
16+
ENDIF()
1617
ENDIF()
1718
ENDMACRO(USE_LAMURE)
1819

src/OpenCOVER/plugins/hlrs/LamurePointCloud/Lamure.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ namespace {
8080
} // namespace
8181

8282

83+
#if 0
8384
#ifdef __cplusplus
8485
extern "C" {
8586
#endif
@@ -88,6 +89,7 @@ extern "C" {
8889
#ifdef __cplusplus
8990
}
9091
#endif
92+
#endif
9193

9294
COVERPLUGIN(Lamure)
9395
Lamure* Lamure::plugin = nullptr;

0 commit comments

Comments
 (0)