-
Notifications
You must be signed in to change notification settings - Fork 26
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merge toolchain-2.9 into master and discard the toolchain-2.x branches? #135
Merged
+15
−25
Merged
Changes from 1 commit
Commits
Show all changes
53 commits
Select commit
Hold shift + click to select a range
84abd86
catkin: provide catkin compatible package.xml file
79ee4d7
fix lib extension for macosx
9bf3cdd
Make it compile on osx
jfdupuis d189e72
cmake: add support for x84_64 OSX systems
2b29e3a
make typelib work on Mac OSX system
612e58f
catkin: added run_depend on catkin to package.xml for released packages
meyerj 256c46f
Preparing 2.7.0 release
648fdfd
cmake: use pkg-config results as input for find_* instead of directly
7236c21
cmake: fix finding library using pkgconfig
ac08bc9
package: add missing build dep on pkgconfig
9830140
package: fix pkgconfig dependency
70c2dc3
Moved typelib-specific parts of the catkin env-hook from orocos_toolc…
meyerj 18d797c
Merge branch 'per-package-env-hook' into catkin
meyerj adb619f
cmake: use catkin_add_env_hooks() macro to install catkin env-hooks i…
meyerj a227f95
re-enable exporting the typelib library path
d48d352
Merge remote-tracking branch 'origin/stable' into toolchain-2.7
1282b06
cmake: do not complain about catkin not being found
602a819
dyncall: fix compilation using Clang 5+
42848ec
bindings/ruby: use port installation for dyncall on OSX since XCode 5…
ff417e6
Merge remote-tracking branch 'origin/toolchain-2.7' into toolchain-2.8
meyerj 7d28003
bumped version to 2.8.0
meyerj 598eed9
typelib: also install ext/typelib.hh header
meyerj b7fd688
Merge remote-tracking branch 'origin/master' into toolchain-2.8
meyerj 5026fb5
Removed CHANGELOG.rst as it is not maintained anyway
meyerj 251439b
Merge remote-tracking branch 'origin/master' into toolchain-2.8
meyerj 6d1b101
Merge remote-tracking branch 'origin/master' into toolchain-2.8
meyerj e6a4902
Revert "typelib: also install ext/typelib.hh header"
meyerj 237f73c
Merge remote-tracking branch 'origin/master' into toolchain-2.8
meyerj fc85335
Merge branch 'typelib-fedora-fixes' into toolchain-2.8
meyerj 5a14326
ugly workaround to make it work on OSX
c01a6c1
adding missing link to pthread
48089c8
Merge tag 'rock-15.05' into toolchain-2.8-ugly-osx-fix
6339de6
nicer fix for wrong arch detection of gccxml on osx
40cd3a8
add missing dependency on boost thread
1d9b7fc
Merge tag 'rock-15.05' of https://github.com/orocos-toolchain/typelib…
meyerj 3d95ed9
Bumped version number to 2.9.0
meyerj 57fa5b1
Merge remote-tracking branch 'origin/toolchain-2.8-rock-15.05' into t…
meyerj 9f7310d
Merge remote-tracking branch 'origin/master' into toolchain-2.9
meyerj 5e8b7c8
Deleted obsolete rosbuild Makefile
meyerj d4779e6
env-hooks: install env-hook to etc/orocos/profile.d
meyerj 08c1123
cmake: fixed Ruby include directories on Ubuntu Trusty
meyerj 9db89cf
Merge branch 'add-orocos-env-hook' into toolchain-2.9
meyerj f39fbf5
Merge remote-tracking branch 'origin/master' into toolchain-2.9
meyerj 5191957
Revert manifest.xml dependency entries back to <rosdep name="...">
meyerj 1c60a27
Merge remote-tracking branch 'origin/master' into toolchain-2.9
meyerj 20c56cf
typelib: fix rosdep compatibility of manifest.xml and merge recent ch…
meyerj b58c8d9
typelib: revert manifest.xml changes and use new rosdep key ruby-dev …
meyerj 89063c5
Merge pull request #109 from orocos-toolchain/toolchain-2.9-fix-manif…
meyerj b374765
Merge branch 'master' into toolchain-2.9
meyerj 32bcec8
Remove the env-hook to set TYPELIB_USE_GCCXML
meyerj 4b05231
package.xml: switch to package.xml format 3 and update maintainer email
meyerj 69476e5
Merge remote-tracking branch 'origin/master' into toolchain-2.9
meyerj 5a4f821
Merge branch 'master' into toolchain-2.9
meyerj File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
nicer fix for wrong arch detection of gccxml on osx
Signed-off-by: Ruben Smits <[email protected]>
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Likely can be discarded if gccxml is obsolete anyway.