Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
E
eigenpy
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
Container Registry
Model registry
Operate
Environments
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
Guilhem Saurel
eigenpy
Commits
34d69371
Unverified
Commit
34d69371
authored
5 years ago
by
Justin Carpentier
Committed by
GitHub
5 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #103 from jcarpent/devel
Fix issue for pkg-config export of the lib
parents
bc37f019
85e64ee1
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.travis.yml
+17
-5
17 additions, 5 deletions
.travis.yml
CMakeLists.txt
+5
-1
5 additions, 1 deletion
CMakeLists.txt
cmake
+1
-1
1 addition, 1 deletion
cmake
with
23 additions
and
7 deletions
.travis.yml
+
17
−
5
View file @
34d69371
language
:
python
python
:
-
"
2.7"
-
"
3.5"
sudo
:
required
compiler
:
-
gcc
...
...
@@ -22,14 +19,28 @@ jobs:
include
:
-
dist
:
bionic
env
:
BUILDTYPE=Release
python
:
2.7
-
dist
:
bionic
env
:
BUILDTYPE=Release
python
:
3.6
-
dist
:
bionic
env
:
BUILDTYPE=Debug
python
:
2.7
-
dist
:
bionic
env
:
BUILDTYPE=Debug
python
:
3.6
-
dist
:
xenial
env
:
BUILDTYPE=Release
python
:
2.7
-
dist
:
xenial
env
:
BUILDTYPE=Debug
env
:
BUILDTYPE=Release
python
:
3.5
-
dist
:
trusty
env
:
BUILDTYPE=Debug
env
:
BUILDTYPE=Release
python
:
2.7
-
dist
:
trusty
env
:
BUILDTYPE=Release
python
:
3.4
notifications
:
email
:
...
...
@@ -44,6 +55,7 @@ install: pip install coveralls numpy
script
:
-
export CMAKE_ADDITIONAL_OPTIONS="-DCMAKE_BUILD_TYPE=${BUILDTYPE}"
-
sudo free -m -t
-
ls -l /usr/lib/x86_64-linux-gnu/libboost_python*
-
./.travis/run ../travis_custom/custom_build
after_failure
:
./.travis/run after_failure
after_success
:
./.travis/run after_success
This diff is collapsed.
Click to expand it.
CMakeLists.txt
+
5
−
1
View file @
34d69371
...
...
@@ -126,7 +126,11 @@ SET(${PROJECT_NAME}_SOURCES
)
ADD_LIBRARY
(
${
PROJECT_NAME
}
SHARED
${${
PROJECT_NAME
}
_SOURCES
}
${${
PROJECT_NAME
}
_HEADERS
}
)
SET_TARGET_PROPERTIES
(
${
PROJECT_NAME
}
PROPERTIES SUFFIX
"
${
PYTHON_EXT_SUFFIX
}
"
)
SET
(
LIB_
${
PROJECT_NAME
}
_SUFFIX
${
PYTHON_EXT_SUFFIX
}
)
IF
(
APPLE
)
STRING
(
REPLACE
".so"
".dylib"
LIB_
${
PROJECT_NAME
}
_SUFFIX
${
LIB_
${
PROJECT_NAME
}
_SUFFIX
}
)
ENDIF
(
APPLE
)
SET_TARGET_PROPERTIES
(
${
PROJECT_NAME
}
PROPERTIES SUFFIX
"
${
LIB_
${
PROJECT_NAME
}
_SUFFIX
}
"
)
TARGET_COMPILE_OPTIONS
(
${
PROJECT_NAME
}
PRIVATE $<$<CXX_COMPILER_ID:MSVC>:-bigobj>
)
TARGET_LINK_BOOST_PYTHON
(
${
PROJECT_NAME
}
)
...
...
This diff is collapsed.
Click to expand it.
cmake
@
e6e09c0b
Compare
efa25a99
...
e6e09c0b
Subproject commit e
fa25a9976b8a6fc9f51d26924d4238d0d4820b1
Subproject commit e
6e09c0b944530c92c17c4fb64cd2a2f63ed46c0
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