Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
ROS Java GenJava
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
CeTI
ROS
ROS Java Packages
ROS Java GenJava
Commits
fdc6de1f
Commit
fdc6de1f
authored
10 years ago
by
Daniel Stonier
Browse files
Options
Downloads
Patches
Plain Diff
bugfix genjava dir variable settings, fixes #1
parent
5bc1cf8c
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
cmake/genjava-catkin-api.cmake.em
+1
-1
1 addition, 1 deletion
cmake/genjava-catkin-api.cmake.em
cmake/genjava-extras.cmake.em
+1
-1
1 addition, 1 deletion
cmake/genjava-extras.cmake.em
with
2 additions
and
2 deletions
cmake/genjava-catkin-api.cmake.em
+
1
−
1
View file @
fdc6de1f
...
...
@@ -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)
...
...
This diff is collapsed.
Click to expand it.
cmake/genjava-extras.cmake.em
+
1
−
1
View file @
fdc6de1f
...
...
@@ -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)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment