Commit 8a63d3e 1 parent 5084153 commit 8a63d3e Copy full SHA for 8a63d3e
File tree 4 files changed +8
-4
lines changed
4 files changed +8
-4
lines changed Original file line number Diff line number Diff line change 1
- # First option: panda3d built through makepanda
2
1
set (Panda3D_DIR)
3
2
if (${Panda3D_DIR} )
4
3
else ()
@@ -12,20 +11,20 @@ set(PANDA3D_LIBS
12
11
#pandaai pandafx pandaphysics pandaskel
13
12
)
14
13
14
+ # First option: built with makepanda
15
15
# Panda3D_DIR should point to the "built" directory generated by makepanda
16
16
if (Panda3D_DIR)
17
- # Find all libraries
18
17
set (LIBRARY_PATHS "${Panda3D_DIR} /lib" )
19
18
set (INCLUDE_PATHS "${Panda3D_DIR} /include" )
20
19
set (Panda3D_BINARY_DIR "${Panda3D_DIR} /bin" )
21
20
22
- else () # Check for installed Panda3D
21
+ else () # Otherwise, check for installed Panda3D
23
22
set (LIBRARY_PATHS "/usr/lib" "/usr/lib/panda3d" "/usr/lib/x86_64-linux-gnu/panda3d" )
24
23
set (INCLUDE_PATHS "/usr/include/panda3d" )
25
24
set (Panda3D_BINARY_DIR "/usr/bin" )
26
25
endif ()
27
26
28
-
27
+ # Fetch all libraries
29
28
set (Panda3D_LIBRARIES "" )
30
29
set (ALL_LIBS_FOUND TRUE )
31
30
foreach (lib_name ${PANDA3D_LIBS} )
Original file line number Diff line number Diff line change @@ -240,6 +240,7 @@ set(VISP_HAVE_OPENCV_NONFREE "@VISP_HAVE_OPENCV_NONFREE@")
240
240
set (VISP_HAVE_OPENCV_VERSION "@VISP_HAVE_OPENCV_VERSION@" )
241
241
set (VISP_HAVE_OPENGL "@VISP_HAVE_OPENGL@" )
242
242
set (VISP_HAVE_OPENMP "@VISP_HAVE_OPENMP@" )
243
+ set (VISP_HAVE_PANDA3D "@VISP_HAVE_PANDA3D@" )
243
244
set (VISP_HAVE_PARPORT "@VISP_HAVE_PARPORT@" )
244
245
set (VISP_HAVE_PCL "@VISP_HAVE_PCL@" )
245
246
set (VISP_HAVE_PIONEER "@VISP_HAVE_PIONEER@" )
Original file line number Diff line number Diff line change 283
283
// Defined if OpenGL library available.
284
284
#cmakedefine VISP_HAVE_OPENGL
285
285
286
+ // Defined if Panda3D is available
287
+ #cmakedefine VISP_HAVE_PANDA3D
288
+
286
289
// Defined if Qt library available (either Qt-3 or Qt-4).
287
290
#cmakedefine VISP_HAVE_QT
288
291
Original file line number Diff line number Diff line change @@ -2409,6 +2409,7 @@ PREDEFINED = @DOXYGEN_SHOULD_SKIP_THIS@ \
2409
2409
HAVE_OPENCV_VIDEO \
2410
2410
HAVE_OPENCV_VIDEOIO \
2411
2411
VISP_HAVE_OPENGL \
2412
+ VISP_HAVE_PANDA3D \
2412
2413
VISP_HAVE_PARPORT \
2413
2414
VISP_HAVE_PCL \
2414
2415
VISP_HAVE_PIONEER \
You can’t perform that action at this time.
0 commit comments