From fdc6de1f2fcf0853906453bb38971a35e9ed12e6 Mon Sep 17 00:00:00 2001
From: Daniel Stonier <d.stonier@gmail.com>
Date: Fri, 27 Feb 2015 17:15:04 +0900
Subject: [PATCH] bugfix genjava dir variable settings, fixes #1
---
cmake/genjava-catkin-api.cmake.em | 2 +-
cmake/genjava-extras.cmake.em | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cmake/genjava-catkin-api.cmake.em b/cmake/genjava-catkin-api.cmake.em
index f2cf35b..fec8705 100644
--- a/cmake/genjava-catkin-api.cmake.em
+++ b/cmake/genjava-catkin-api.cmake.em
@@ -2,7 +2,7 @@
# location of scripts in develspace
set(GENJAVA_MESSAGE_ARTIFACTS_BIN_DIR "@(CMAKE_CURRENT_SOURCE_DIR)/scripts")
@[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]@
set(GENJAVA_MESSAGE_ARTIFACTS_BIN ${GENJAVA_MESSAGE_ARTIFACTS_BIN_DIR}/genjava_message_artifacts)
diff --git a/cmake/genjava-extras.cmake.em b/cmake/genjava-extras.cmake.em
index edf6cb2..02c3e86 100644
--- a/cmake/genjava-extras.cmake.em
+++ b/cmake/genjava-extras.cmake.em
@@ -3,7 +3,7 @@
set(GENJAVA_BIN_DIR "@(CMAKE_CURRENT_SOURCE_DIR)/scripts")
@[else]@
# 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]@
set(GENJAVA_BIN ${GENJAVA_BIN_DIR}/genjava_gradle_project.py)
--
GitLab