[Jderobot-admin] jderobot-r1199 - in trunk: . src/stable/components/gazeboserver

[rocapal en jderobot.org]

Author: rocapal
Date: 2014-03-18 17:17:03 +0100 (Tue, 18 Mar 2014)
New Revision: 1199

Modified:
   trunk/CMakeLists.txt
   trunk/src/stable/components/gazeboserver/CMakeLists.txt
Log:
#197 Move the install process to gazeboserver component


Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt	2014-03-18 16:13:47 UTC (rev 1198)
+++ trunk/CMakeLists.txt	2014-03-18 16:17:03 UTC (rev 1199)
@@ -182,25 +182,7 @@
 FILE(GLOB_RECURSE GLADE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/stable/components/*.glade)
 INSTALL (FILES ${GLADE_FILES} DESTINATION /usr/local/share/jderobot/glade)
 
-# Install Gazebo Models
-INSTALL (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/src/stable/components/gazeboserver/models DESTINATION /usr/local/share/jderobot/gazebo/ PATTERN .svn EXCLUDE)
 
-# Install Gazebo Plugins
-SET(PLUGINS "kinect" "nao" "pioneer")
-
-FOREACH (PLUGIN ${PLUGINS})
-	FILE(GLOB_RECURSE SO_FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/stable/components/gazeboserver/plugins/${PLUGIN}/*.so)
-	INSTALL (FILES ${SO_FILES} DESTINATION /usr/lib/gazebo-1.8/plugins-jderobot/${PLUGIN}/ )
-	FILE(GLOB_RECURSE CFG_FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/stable/components/gazeboserver/plugins/${PLUGIN}/*.cfg)
-	INSTALL (FILES ${CFG_FILES} DESTINATION /usr/lib/gazebo-1.8/plugins-jderobot/${PLUGIN}/ )
-	INSTALL (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/src/stable/components/gazeboserver/plugins/${PLUGIN}/worlds/ 
-		 DESTINATION /usr/lib/gazebo-1.8/plugins-jderobot/${PLUGIN}/worlds/
-		 PATTERN .svn EXCLUDE)
-ENDFOREACH(PLUGIN)
-
-
-
-
 ###################
 #                 #
 #    UNINSTALL    #

Modified: trunk/src/stable/components/gazeboserver/CMakeLists.txt
===================================================================
--- trunk/src/stable/components/gazeboserver/CMakeLists.txt	2014-03-18 16:13:47 UTC (rev 1198)
+++ trunk/src/stable/components/gazeboserver/CMakeLists.txt	2014-03-18 16:17:03 UTC (rev 1199)
@@ -1,5 +1,25 @@
 IF (GAZEBO_INCLUDE_DIRS)
 
-add_subdirectory (${CMAKE_CURRENT_SOURCE_DIR}/plugins ${CMAKE_CURRENT_SOURCE_DIR}/plugins)
+	add_subdirectory (${CMAKE_CURRENT_SOURCE_DIR}/plugins ${CMAKE_CURRENT_SOURCE_DIR}/plugins)
 
+
+	## INSTALL ##
+
+
+	# Install Gazebo Models
+	INSTALL (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/models DESTINATION /usr/local/share/jderobot/gazebo/ PATTERN .svn EXCLUDE)
+
+	# Install Gazebo Worlds
+	INSTALL (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/worlds DESTINATION /usr/local/share/jderobot/gazebo/ PATTERN .svn EXCLUDE)
+
+	# Install Gazebo Plugins
+	SET(PLUGINS "kinect" "nao" "pioneer")
+
+	FOREACH (PLUGIN ${PLUGINS})
+		FILE(GLOB_RECURSE SO_FILES ${CMAKE_CURRENT_SOURCE_DIR}/plugins/${PLUGIN}/*.so)
+		INSTALL (FILES ${SO_FILES} DESTINATION /usr/lib/gazebo-1.8/plugins-jderobot/${PLUGIN}/ )
+		FILE(GLOB_RECURSE CFG_FILES ${CMAKE_CURRENT_SOURCE_DIR}/plugins/${PLUGIN}/*.cfg)
+		INSTALL (FILES ${CFG_FILES} DESTINATION /usr/lib/gazebo-1.8/plugins-jderobot/${PLUGIN}/ )	
+	ENDFOREACH(PLUGIN)
+
 ENDIF()