Skip to content
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

generates standard CMake *Config.cmake and *Version.cmake files #26

Closed
wants to merge 60 commits into from

Conversation

ahundt
Copy link

@ahundt ahundt commented Jan 11, 2017

gergondet and others added 30 commits December 4, 2015 16:28
* Update cmake files
* Export the DLL api
* Fix a test precision (1e-9 vs. 1e-10)
* Add `#include <vector>` in two places
7a40a28 Update submodule before building
bc0a72e [Win32] Solve an issue in functions
99d898d [Win32] Add AppVeyor support
1e4f677 eigen: fix cflags
0fced9b eigen: fix for new pkg-config handling
4240350 eigen: update to 3.2.8
3b01c11 dependencies: update NAG to Mark 25
507fed5 Merge pull request jrl-umi3218#25 from olivier-stasse/master
971d761 Remove lcov from ppa installation and uses 1.12 release tarball
bf3d460 Merge pull request jrl-umi3218#23 from haudren/topic/fix-english
b889a27 Correct multiple typos and some syntax
70b93ea Pass CMAKE_ADDITIONAL_OPTIONS to git dependencies
ec12523 Merge pull request jrl-umi3218#21 from gergondet/topic/FixCatkinDependencies
72765fe Build ROS git dependencies in a separate workspace
ee85d3a Fix test on ROS_GIT_DEPENDENCIES
e54278a Reflect change to branch character delimiter in comment
f8c01cf Actually build ROS git dependencies
9756122 Factorize git dependency handling
d002d2a Stop relying on exit codes to avoid issues with set -e
bd9308e after_success: prevent failure
08bac20 [dependencies] Use -qq when installing ros packages
ca8a895 [dependencies] Automatically select the right ubuntu repository
edfdf75 Merge pull request jrl-umi3218#20 from gergondet/topic/Reforge
9979090 Only update the documentation if gh-pages branch exists
41133ab Re-write all scripts in a functions/main way
90c3ab9 Add support for ssh-formed git dependencies
66007c9 Add a script to install pybindgen-0.16
41116fc Fix eigen script for eigen 3.2.7
acf4e57 Adapt the scripts to non-travis environment
c000879 dependencies: update Eigen version to 3.2.7

git-subtree-dir: .travis
git-subtree-split: 7a40a28a601e0b841a9a884ce91902f162a749a8
* Merge Win32 PR
* Update relevant URLs
* Add AppVeyor and license badges
* Add copyright notice
* Disable python bindings by default
* Add missing license in a few files
This entails removing the id property from the library, tests, and bindings

Detailed changes:
* Remove id from Joint, Body, mbg, mb, mbc
* Adapt Jacobian, CoM, Momentum
* Adapt tests and benchmarks
* Adapt python bindings and tests
aescande and others added 21 commits April 28, 2016 19:01
Add fixJoint factory to MultiBodyGraph
changes made with command:
git subtree pull --squash --prefix cmake git@github.com:ahundt/jrl-cmakemodules.git package
for jrl-umi3218/jrl-cmakemodules#103
2700d88 base.cmake caps fixed, removed extra comments
e77b553 added missing Config.cmake.in
423d888 Can now generate standard CMake *Config.cmake and *Version.cmake files. based on: https://github.com/forexample/package-example
c8ae597 Merge pull request jrl-umi3218#102 from jcarpent/devel
bf1075b Add macro ADD_COMPILE_DEPENDENCY
7927aef Merge pull request jrl-umi3218#101 from jcarpent/devel
2dacec6 Cast from LIST to STRING - mandatory for old CMake version
9c2d56b Merge pull request jrl-umi3218#100 from jcarpent/devel
d806346 Correct use of COMPILE_OPTIONS option
45ea807 Merge pull request jrl-umi3218#99 from jcarpent/devel
37fba66 Make doc optional if INSTALL_DOCUMENTATION is set
83d3fa7 Merge pull request jrl-umi3218#98 from francois-keith/master2
09ec6dd Correct typo.
bd35ff0 Merge pull request jrl-umi3218#96 from jcarpent/devel
77dd67f [Boost] Fix target variable
f4af278 Merge pull request jrl-umi3218#95 from jcarpent/devel
40d7f88 [boost] Correct bug with the IF statement
1c4340a Merge pull request jrl-umi3218#94 from jcarpent/devel
adead55 Add linkage option inside the .pc file
dc7e8c5 Add warning message when removing boost_python from Boost_LIBRARIES
24a04e1 Properly handle linking against boost_python on APPLE
9965dbc Merge pull request jrl-umi3218#93 from olivier-stasse/master
042e705 Make python.cmake compatible with old cmake version.
00a2893 Merge pull request jrl-umi3218#92 from olivier-stasse/master
c7c0874 Add cmake_policy(push) and cmake_policy(pop).
8f832e3 [python] Update cmake policy
14fd366 Remove SYSTEM from a LINK_DIRECTORIES command
4e534ca Merge pull request jrl-umi3218#90 from aescande/master
a81e1d6 Adding quote to accept paths with spaces (python.cmake)
9c30b64 INCLUDE/LINK_DIRECTORIES for debug variant
daa86e8 Merge pull request jrl-umi3218#89 from aescande/master
12447f0 update GENERATE_MSVC_DOT_USER_FILE macro to accept additional paths
57838ad Adding quote to CFlags of pkg-config to handle correctly space in paths

git-subtree-dir: cmake
git-subtree-split: 2700d88d97c53418caa5066128f6d1fd8ce0d4e0
5e0e3a9 Config.cmake.in capitalization fix

git-subtree-dir: cmake
git-subtree-split: 5e0e3a97b748aec181d01b666db44c938042a335
6372546 rename package.cmake to package-config.cmake and move setup init as per pull request comments linked here: jrl-umi3218/jrl-cmakemodules#103 (comment)
d88eb2e package.cmake added, moved SETUP_PROJECT_PACKAGE_FINALIZE
a306eae SETUP_PROJECT_PACKAGE_FINALIZE is now public as discussed, this is option 1 in the following comment: jrl-umi3218/jrl-cmakemodules#103 (comment)

git-subtree-dir: cmake
git-subtree-split: 6372546402bc3903d6f7fb4c7a9457eb0246a588
# Conflicts:
#	.travis.yml
#	src/CMakeLists.txt
#	src/VisServo.h
#	tests/CMakeLists.txt
@haudren
Copy link
Collaborator

haudren commented Jan 11, 2017

It seems that this PR (similarly to #25 ) was based on the pre-migration version of RBDyn. Long story short, we migrated the main repository from jorisv to jrl-umi3218, but the commit history was modified and conflicts. Can you base your PR on this version ? I think you basically only want to update cmake and slightly modify CMakeLists.txt.

@haudren haudren self-requested a review January 11, 2017 02:43
@ahundt
Copy link
Author

ahundt commented Jan 11, 2017

@haudren oh geez that's scary... hmm it will be tough for me to go back on all my repos that are based on the jorisv versions...

possible ways around this:
https://github.com/blog/2141-squash-your-commits
https://help.github.com/articles/about-pull-request-merges/
mislav/hub#1339

@ahundt
Copy link
Author

ahundt commented Jan 11, 2017

That last one mislav/hub#1339 worked beautifully and now everything is in #27 so closing this.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants