Skip to content

Commit 8a63d3e

Browse files
committed
Add VISP_HAVE_PANDA3D_FLAG
1 parent 5084153 commit 8a63d3e

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

cmake/FindMyPanda3D.cmake

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# First option: panda3d built through makepanda
21
set(Panda3D_DIR)
32
if(${Panda3D_DIR})
43
else()
@@ -12,20 +11,20 @@ set(PANDA3D_LIBS
1211
#pandaai pandafx pandaphysics pandaskel
1312
)
1413

14+
# First option: built with makepanda
1515
# Panda3D_DIR should point to the "built" directory generated by makepanda
1616
if(Panda3D_DIR)
17-
# Find all libraries
1817
set(LIBRARY_PATHS "${Panda3D_DIR}/lib")
1918
set(INCLUDE_PATHS "${Panda3D_DIR}/include")
2019
set(Panda3D_BINARY_DIR "${Panda3D_DIR}/bin")
2120

22-
else() # Check for installed Panda3D
21+
else() # Otherwise, check for installed Panda3D
2322
set(LIBRARY_PATHS "/usr/lib" "/usr/lib/panda3d" "/usr/lib/x86_64-linux-gnu/panda3d")
2423
set(INCLUDE_PATHS "/usr/include/panda3d")
2524
set(Panda3D_BINARY_DIR "/usr/bin")
2625
endif()
2726

28-
27+
# Fetch all libraries
2928
set(Panda3D_LIBRARIES "")
3029
set(ALL_LIBS_FOUND TRUE)
3130
foreach(lib_name ${PANDA3D_LIBS})

cmake/templates/VISPConfig.cmake.in

+1
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,7 @@ set(VISP_HAVE_OPENCV_NONFREE "@VISP_HAVE_OPENCV_NONFREE@")
240240
set(VISP_HAVE_OPENCV_VERSION "@VISP_HAVE_OPENCV_VERSION@")
241241
set(VISP_HAVE_OPENGL "@VISP_HAVE_OPENGL@")
242242
set(VISP_HAVE_OPENMP "@VISP_HAVE_OPENMP@")
243+
set(VISP_HAVE_PANDA3D "@VISP_HAVE_PANDA3D@")
243244
set(VISP_HAVE_PARPORT "@VISP_HAVE_PARPORT@")
244245
set(VISP_HAVE_PCL "@VISP_HAVE_PCL@")
245246
set(VISP_HAVE_PIONEER "@VISP_HAVE_PIONEER@")

cmake/templates/vpConfig.h.in

+3
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,9 @@
283283
// Defined if OpenGL library available.
284284
#cmakedefine VISP_HAVE_OPENGL
285285

286+
// Defined if Panda3D is available
287+
#cmakedefine VISP_HAVE_PANDA3D
288+
286289
// Defined if Qt library available (either Qt-3 or Qt-4).
287290
#cmakedefine VISP_HAVE_QT
288291

doc/config-doxygen.in

+1
Original file line numberDiff line numberDiff line change
@@ -2409,6 +2409,7 @@ PREDEFINED = @DOXYGEN_SHOULD_SKIP_THIS@ \
24092409
HAVE_OPENCV_VIDEO \
24102410
HAVE_OPENCV_VIDEOIO \
24112411
VISP_HAVE_OPENGL \
2412+
VISP_HAVE_PANDA3D \
24122413
VISP_HAVE_PARPORT \
24132414
VISP_HAVE_PCL \
24142415
VISP_HAVE_PIONEER \

0 commit comments

Comments
 (0)