Skip to content
This repository was archived by the owner on Jan 14, 2023. It is now read-only.

Commit fdc6de1

Browse files
committed
bugfix genjava dir variable settings, fixes #1
1 parent 5bc1cf8 commit fdc6de1

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

cmake/genjava-catkin-api.cmake.em

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# location of scripts in develspace
33
set(GENJAVA_MESSAGE_ARTIFACTS_BIN_DIR "@(CMAKE_CURRENT_SOURCE_DIR)/scripts")
44
@[else]@
5-
set(GENJAVA_MESSAGE_ARTIFACTS_BIN_DIR "${GENJAVA_DIR}/../../../@(CATKIN_PACKAGE_BIN_DESTINATION)")
5+
set(GENJAVA_MESSAGE_ARTIFACTS_BIN_DIR "${genjava_DIR}/../../../@(CATKIN_PACKAGE_BIN_DESTINATION)")
66
@[end if]@
77

88
set(GENJAVA_MESSAGE_ARTIFACTS_BIN ${GENJAVA_MESSAGE_ARTIFACTS_BIN_DIR}/genjava_message_artifacts)

cmake/genjava-extras.cmake.em

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
set(GENJAVA_BIN_DIR "@(CMAKE_CURRENT_SOURCE_DIR)/scripts")
44
@[else]@
55
# location of scripts in installspace
6-
set(GENJAVA_BIN_DIR "${GENJAVA_DIR}/../../../@(CATKIN_PACKAGE_BIN_DESTINATION)")
6+
set(GENJAVA_BIN_DIR "${genjava_DIR}/../../../@(CATKIN_PACKAGE_BIN_DESTINATION)")
77
@[end if]@
88

99
set(GENJAVA_BIN ${GENJAVA_BIN_DIR}/genjava_gradle_project.py)

0 commit comments

Comments
 (0)