Merge pull request #1 from mojin-robotics/fix_travis

fix travis
rosjava · Jul 30, 2018 · ce9a37f · ce9a37f
2 parents 5b5afb4 + 70fdb03
commit ce9a37f
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/cmake/rosjava.cmake.em b/cmake/rosjava.cmake.em
@@ -86,8 +86,8 @@ macro(catkin_rosjava_setup)
     ###################################
     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} ${gradle_tasks}
-        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+        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}"
     )
@@ -110,7 +110,7 @@ macro(catkin_rosjava_setup)
     endif()
     add_custom_target(gradle-clean-${PROJECT_NAME}
         COMMAND ${CATKIN_ENV} ${${PROJECT_NAME}_gradle_BINARY} clean
-        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+        WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
         COMMENT "Cleaning gradle project for ${PROJECT_NAME}"
     )
     add_dependencies(gradle-clean gradle-clean-${PROJECT_NAME})
@@ -132,8 +132,8 @@ macro(catkin_android_setup)
     endif()
     add_custom_target(gradle-${PROJECT_NAME}
         ALL
-        COMMAND ${ROSJAVA_ENV} ${CATKIN_ENV} ${${PROJECT_NAME}_gradle_BINARY} ${gradle_tasks}
-        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+        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()
@@ -148,7 +148,7 @@ macro(catkin_android_setup)
     endif()
     add_custom_target(gradle-clean-${PROJECT_NAME}
         COMMAND ${CATKIN_ENV} ${${PROJECT_NAME}_gradle_BINARY} clean
-        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+        WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
     )
     add_dependencies(gradle-clean gradle-clean-${PROJECT_NAME})
 endmacro()