Remove unnecessary ugv_nav4d-qt5 variant (the library does not depend on qt directly)

Author: chhtz

src/CMakeLists.txt

@@ -16,67 +16,34 @@ set(DEPS_PKGCONFIG_LIST
 	trajectory_follower
 )
 
-if (ROCK_QT_VERSION_4)
-	if (ENABLE_DEBUG_DRAWINGS)
-		list(APPEND DEPS_PKGCONFIG_LIST vizkit3d_debug_drawings)
-	endif()
-
-	rock_library(ugv_nav4d
-	    SOURCES
-		DiscreteTheta.cpp
-		EnvironmentXYZTheta.cpp
-		PathStatistic.cpp
-		Planner.cpp
-		PlannerDump.cpp
-		PreComputedMotions.cpp
-		Dijkstra.cpp
-		ObstacleMapGenerator3D.cpp
-		DebugDrawingDeclarations.cpp
-	    HEADERS
-		Mobility.hpp
-		DiscreteTheta.hpp
-		EnvironmentXYZTheta.hpp
-		PathStatistic.hpp
-		Planner.hpp
-		PlannerConfig.hpp
-		PreComputedMotions.hpp
-		Dijkstra.hpp
-		ObstacleMapGenerator3D.hpp
-	    DEPS_PKGCONFIG
-		${DEPS_PKGCONFIG_LIST}
-	)
+if (ENABLE_DEBUG_DRAWINGS)
+	list(APPEND DEPS_PKGCONFIG_LIST vizkit3d_debug_drawings-commands)
 endif()
 
-if (ROCK_QT_VERSION_5)
-	if (ENABLE_DEBUG_DRAWINGS)
-		list(APPEND DEPS_PKGCONFIG_LIST vizkit3d_debug_drawings-qt5)
-	endif()
-
-	rock_library(ugv_nav4d-qt5
-	    SOURCES 
-		DiscreteTheta.cpp
-		EnvironmentXYZTheta.cpp
-		PathStatistic.cpp
-		Planner.cpp
-		PlannerDump.cpp
-		PreComputedMotions.cpp
-		Dijkstra.cpp
-		ObstacleMapGenerator3D.cpp
-		DebugDrawingDeclarations.cpp
-	    HEADERS 
-		Mobility.hpp
-		DiscreteTheta.hpp
-		EnvironmentXYZTheta.hpp
-		PathStatistic.hpp
-		Planner.hpp
-		PlannerConfig.hpp
-		PreComputedMotions.hpp
-		Dijkstra.hpp
-		ObstacleMapGenerator3D.hpp
-	    DEPS_PKGCONFIG 
-		${DEPS_PKGCONFIG_LIST}
-	)
-endif()
+rock_library(ugv_nav4d
+    SOURCES 
+	DiscreteTheta.cpp
+	EnvironmentXYZTheta.cpp
+	PathStatistic.cpp
+	Planner.cpp
+	PlannerDump.cpp
+	PreComputedMotions.cpp
+	Dijkstra.cpp
+	ObstacleMapGenerator3D.cpp
+	DebugDrawingDeclarations.cpp
+    HEADERS 
+	Mobility.hpp
+	DiscreteTheta.hpp
+	EnvironmentXYZTheta.hpp
+	PathStatistic.hpp
+	Planner.hpp
+	PlannerConfig.hpp
+	PreComputedMotions.hpp
+	Dijkstra.hpp
+	ObstacleMapGenerator3D.hpp
+    DEPS_PKGCONFIG 
+	${DEPS_PKGCONFIG_LIST}
+)
 
 add_subdirectory(gui)
 

src/gui/CMakeLists.txt

@@ -46,7 +46,7 @@ if(ROCK_QT_VERSION_5)
             PlannerGui.h
         MOC5
             PlannerGui.h
-        DEPS ugv_nav4d-qt5 Qt5::Core
+        DEPS ugv_nav4d Qt5::Core
         DEPS_PKGCONFIG vizkit3d-qt5
                        vizkit3d-viz-qt5
                        maps-viz-qt5
@@ -61,14 +61,14 @@ if(ROCK_QT_VERSION_5)
     rock_executable(ugv_nav4d_bin-qt5
         SOURCES
             Main.cpp
-        DEPS ugv_nav4d-qt5 ugv_nav4d_gui-qt5
+        DEPS ugv_nav4d ugv_nav4d_gui-qt5
     )
 
     rock_executable(ugv_nav4d_replay-qt5
         SOURCES
             ReplayDump.cpp
-        DEPS ugv_nav4d-qt5 ugv_nav4d_gui-qt5
+        DEPS ugv_nav4d ugv_nav4d_gui-qt5
         DEPS_PKGCONFIG vizkit3d-qt5  maps-viz-qt5 base-viz-qt5
         sbpl_spline_primitives-viz-qt5 base-types trajectory_follower-viz-qt5
     )
-endif(ROCK_QT_VERSION_5)
+endif(ROCK_QT_VERSION_5)