Skip to content
Snippets Groups Projects
Commit fdc6de1f authored by Daniel Stonier's avatar Daniel Stonier
Browse files

bugfix genjava dir variable settings, fixes #1

parent 5bc1cf8c
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
cmake/genjava-catkin-api.cmake.em
+ 1
− 1
View file @ fdc6de1f
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# location of scripts in develspace # location of scripts in develspace
set(GENJAVA_MESSAGE_ARTIFACTS_BIN_DIR "@(CMAKE_CURRENT_SOURCE_DIR)/scripts") set(GENJAVA_MESSAGE_ARTIFACTS_BIN_DIR "@(CMAKE_CURRENT_SOURCE_DIR)/scripts")
@[else]@ @[else]@
set(GENJAVA_MESSAGE_ARTIFACTS_BIN_DIR "${GENJAVA_DIR}/../../../@(CATKIN_PACKAGE_BIN_DESTINATION)") set(GENJAVA_MESSAGE_ARTIFACTS_BIN_DIR "${genjava_DIR}/../../../@(CATKIN_PACKAGE_BIN_DESTINATION)")
@[end if]@ @[end if]@
set(GENJAVA_MESSAGE_ARTIFACTS_BIN ${GENJAVA_MESSAGE_ARTIFACTS_BIN_DIR}/genjava_message_artifacts) set(GENJAVA_MESSAGE_ARTIFACTS_BIN ${GENJAVA_MESSAGE_ARTIFACTS_BIN_DIR}/genjava_message_artifacts)
......
cmake/genjava-extras.cmake.em
+ 1
− 1
View file @ fdc6de1f
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
set(GENJAVA_BIN_DIR "@(CMAKE_CURRENT_SOURCE_DIR)/scripts") set(GENJAVA_BIN_DIR "@(CMAKE_CURRENT_SOURCE_DIR)/scripts")
@[else]@ @[else]@
# location of scripts in installspace # location of scripts in installspace
set(GENJAVA_BIN_DIR "${GENJAVA_DIR}/../../../@(CATKIN_PACKAGE_BIN_DESTINATION)") set(GENJAVA_BIN_DIR "${genjava_DIR}/../../../@(CATKIN_PACKAGE_BIN_DESTINATION)")
@[end if]@ @[end if]@
set(GENJAVA_BIN ${GENJAVA_BIN_DIR}/genjava_gradle_project.py) set(GENJAVA_BIN ${GENJAVA_BIN_DIR}/genjava_gradle_project.py)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment