Merge pull request rosjava#42 from ivanpauno/fix/find-gradle

Juan Ignacio Ubeira · web-flow · commit 6ca982393ad0 · 2019-01-04T17:36:25.000-03:00
Fixed problem to find gradlew when cross-compiling
diff --git a/cmake/rosjava.cmake.em b/cmake/rosjava.cmake.em
@@ -15,6 +15,7 @@ macro(find_gradle)
           ${CMAKE_CURRENT_SOURCE_DIR}/..
           ${CMAKE_CURRENT_SOURCE_DIR}/../..
           NO_DEFAULT_PATH
+          NO_CMAKE_FIND_ROOT_PATH
           )
      if(NOT ${PROJECT_NAME}_gradle_BINARY)
          message(FATAL_ERROR "Could not find the gradle wrapper in this directory or below.")

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ macro(find_gradle)`
`15`	`15`	`${CMAKE_CURRENT_SOURCE_DIR}/..`
`16`	`16`	`${CMAKE_CURRENT_SOURCE_DIR}/../..`
`17`	`17`	`NO_DEFAULT_PATH`
	`18`	`+ NO_CMAKE_FIND_ROOT_PATH`
`18`	`19`	`)`
`19`	`20`	`if(NOT ${PROJECT_NAME}_gradle_BINARY)`
`20`	`21`	`message(FATAL_ERROR "Could not find the gradle wrapper in this directory or below.")`