simplify macros

Author: fmessmer

cmake/rosjava.cmake.em

@@ -84,11 +84,10 @@ macro(catkin_rosjava_setup)
     ###################################
     # Execution
     ###################################
-    file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/${PROJECT_NAME}-src)
     add_custom_target(gradle-${PROJECT_NAME} ALL
         #COMMAND ${ROSJAVA_ENV} ${CATKIN_ENV} "env" "|" "grep" "ROS" 
-        COMMAND ${ROSJAVA_ENV} ${CATKIN_ENV} ${${PROJECT_NAME}_gradle_BINARY} ${gradle_options} --project-dir ${CMAKE_CURRENT_SOURCE_DIR}  --project-cache-dir ${PROJECT_BINARY_DIR}/${PROJECT_NAME}-src/.gradle -PbuildDir=${PROJECT_BINARY_DIR}/${PROJECT_NAME}-src ${gradle_tasks}
-        WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/${PROJECT_NAME}-src
+        COMMAND ${ROSJAVA_ENV} ${CATKIN_ENV} ${${PROJECT_NAME}_gradle_BINARY} ${gradle_options} --project-dir ${CMAKE_CURRENT_SOURCE_DIR}  --project-cache-dir ${PROJECT_BINARY_DIR}/.gradle -PbuildDir=${PROJECT_BINARY_DIR} ${gradle_tasks}
+        WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
         VERBATIM
         COMMENT "Gradling tasks for ${PROJECT_NAME}"
     )
@@ -109,10 +108,9 @@ macro(catkin_rosjava_setup)
     if(NOT TARGET gradle-clean)
         add_custom_target(gradle-clean)
     endif()
-    file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/${PROJECT_NAME}-src)
     add_custom_target(gradle-clean-${PROJECT_NAME}
         COMMAND ${CATKIN_ENV} ${${PROJECT_NAME}_gradle_BINARY} clean
-        WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/${PROJECT_NAME}-src
+        WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
         COMMENT "Cleaning gradle project for ${PROJECT_NAME}"
     )
     add_dependencies(gradle-clean gradle-clean-${PROJECT_NAME})
@@ -132,11 +130,10 @@ macro(catkin_android_setup)
     else()
       set(gradle_tasks ${ARGV})
     endif()
-    file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/${PROJECT_NAME}-src)
     add_custom_target(gradle-${PROJECT_NAME}
         ALL
-        COMMAND ${ROSJAVA_ENV} ${CATKIN_ENV} ${${PROJECT_NAME}_gradle_BINARY} --project-dir ${CMAKE_CURRENT_SOURCE_DIR} --project-cache-dir ${PROJECT_BINARY_DIR}/${PROJECT_NAME}-src/.gradle -PbuildDir=${PROJECT_BINARY_DIR}/${PROJECT_NAME}-src ${gradle_tasks}
-        WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/${PROJECT_NAME}-src
+        COMMAND ${ROSJAVA_ENV} ${CATKIN_ENV} ${${PROJECT_NAME}_gradle_BINARY} --project-dir ${CMAKE_CURRENT_SOURCE_DIR} --project-cache-dir ${PROJECT_BINARY_DIR}/.gradle -PbuildDir=${PROJECT_BINARY_DIR} ${gradle_tasks}
+        WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
         VERBATIM
     )
     catkin_package_xml()
@@ -149,10 +146,9 @@ macro(catkin_android_setup)
     if(NOT TARGET gradle-clean)
         add_custom_target(gradle-clean)
     endif()
-    file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/${PROJECT_NAME}-src)
     add_custom_target(gradle-clean-${PROJECT_NAME}
         COMMAND ${CATKIN_ENV} ${${PROJECT_NAME}_gradle_BINARY} clean
-        WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/${PROJECT_NAME}-src
+        WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
     )
     add_dependencies(gradle-clean gradle-clean-${PROJECT_NAME})
 endmacro()