From c39ea4fceb817fbbdb027510791f9a1e20fca675 Mon Sep 17 00:00:00 2001 From: Daniel Stonier <d.stonier@gmail.com> Date: Fri, 20 Feb 2015 15:14:29 +0900 Subject: [PATCH] bugifx variable override between both cmake modules. --- cmake/genjava-catkin-api.cmake.em | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/genjava-catkin-api.cmake.em b/cmake/genjava-catkin-api.cmake.em index 9f8a7a4..f2cf35b 100644 --- a/cmake/genjava-catkin-api.cmake.em +++ b/cmake/genjava-catkin-api.cmake.em @@ -1,11 +1,11 @@ @[if DEVELSPACE]@ # location of scripts in develspace - set(GENJAVA_BIN_DIR "@(CMAKE_CURRENT_SOURCE_DIR)/scripts") + set(GENJAVA_MESSAGE_ARTIFACTS_BIN_DIR "@(CMAKE_CURRENT_SOURCE_DIR)/scripts") @[else]@ - set(GENJAVA_BIN_DIR "${GENJAVA_DIR}/../../../@(CATKIN_PACKAGE_BIN_DESTINATION)") + set(GENJAVA_MESSAGE_ARTIFACTS_BIN_DIR "${GENJAVA_DIR}/../../../@(CATKIN_PACKAGE_BIN_DESTINATION)") @[end if]@ -set(GENJAVA_BIN ${GENJAVA_BIN_DIR}/genjava_message_artifacts) +set(GENJAVA_MESSAGE_ARTIFACTS_BIN ${GENJAVA_MESSAGE_ARTIFACTS_BIN_DIR}/genjava_message_artifacts) set(genjava_INSTALL_DIR "maven/org/ros/rosjava_messages") include(CMakeParseArguments) @@ -39,7 +39,7 @@ macro(generate_rosjava_messages) add_custom_target(${PROJECT_NAME}_generate_artifacts ALL - COMMAND ${CATKIN_ENV} ${PYTHON_EXECUTABLE} ${GENJAVA_BIN} + COMMAND ${CATKIN_ENV} ${PYTHON_EXECUTABLE} ${GENJAVA_MESSAGE_ARTIFACTS_BIN} ${verbosity} --avoid-rebuilding -o ${CMAKE_CURRENT_BINARY_DIR} -- GitLab