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
Stack Of Tasks
eigenpy
Commits
4683053f
Commit
4683053f
authored
9 years ago
by
jcarpent
Browse files
Options
Downloads
Patches
Plain Diff
[Minor] Remove useless file and lines
parent
b19d6563
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
CMakeLists.txt
+3
-9
3 additions, 9 deletions
CMakeLists.txt
eigenpy.pc.cmake
+0
-13
0 additions, 13 deletions
eigenpy.pc.cmake
with
3 additions
and
22 deletions
CMakeLists.txt
+
3
−
9
View file @
4683053f
...
@@ -6,26 +6,23 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
...
@@ -6,26 +6,23 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
INCLUDE
(
cmake/base.cmake
)
INCLUDE
(
cmake/base.cmake
)
INCLUDE
(
cmake/boost.cmake
)
INCLUDE
(
cmake/boost.cmake
)
INCLUDE
(
cmake/cpack.cmake
)
INCLUDE
(
cmake/eigen.cmake
)
INCLUDE
(
cmake/python.cmake
)
INCLUDE
(
cmake/python.cmake
)
SET
(
PROJECT_NAME eigenpy
)
SET
(
PROJECT_NAME eigenpy
)
SET
(
PROJECT_DESCRIPTION
"Wrapping Eigen3 -- numpy"
)
SET
(
PROJECT_DESCRIPTION
"Wrapping Eigen3 -- numpy"
)
SET
(
PROJECT_URL
"http://github.com/stac-of-tasks/eigenpy"
)
SET
(
PROJECT_URL
"http://github.com/stac
k
-of-tasks/eigenpy"
)
# Disable -Werror on Unix for now.
# Disable -Werror on Unix for now.
SET
(
CXX_DISABLE_WERROR True
)
SET
(
CXX_DISABLE_WERROR True
)
SET
(
CMAKE_VERBOSE_MAKEFILE True
)
SET
(
CMAKE_VERBOSE_MAKEFILE True
)
project
(
${
PROJECT_NAME
}
)
SETUP_PROJECT
()
SETUP_PROJECT
()
STRING
(
REPLACE
"-pedantic"
""
CMAKE_CXX_FLAGS
${
CMAKE_CXX_FLAGS
}
)
STRING
(
REPLACE
"-pedantic"
""
CMAKE_CXX_FLAGS
${
CMAKE_CXX_FLAGS
}
)
# ----------------------------------------------------
# ----------------------------------------------------
# --- DEPENDANCIES -----------------------------------
# --- DEPENDANCIES -----------------------------------
# ----------------------------------------------------
# ----------------------------------------------------
SEARCH_FOR_EIGEN
(
)
ADD_REQUIRED_DEPENDENCY
(
"eigen3 >= 3.0.5"
)
SET
(
BOOST_COMPONENTS python
)
SET
(
BOOST_COMPONENTS python
)
SEARCH_FOR_BOOST
()
SEARCH_FOR_BOOST
()
set
(
Python_ADDITIONAL_VERSIONS 2.7
)
set
(
Python_ADDITIONAL_VERSIONS 2.7
)
...
@@ -81,6 +78,7 @@ SET(${PROJECT_NAME}_SOURCES
...
@@ -81,6 +78,7 @@ SET(${PROJECT_NAME}_SOURCES
ADD_LIBRARY
(
${
PROJECT_NAME
}
SHARED
${${
PROJECT_NAME
}
_SOURCES
}
)
ADD_LIBRARY
(
${
PROJECT_NAME
}
SHARED
${${
PROJECT_NAME
}
_SOURCES
}
)
TARGET_LINK_LIBRARIES
(
${
PROJECT_NAME
}
${
Boost_LIBRARIES
}
${
PYTHON_LIBRARIES
}
)
TARGET_LINK_LIBRARIES
(
${
PROJECT_NAME
}
${
Boost_LIBRARIES
}
${
PYTHON_LIBRARIES
}
)
PKG_CONFIG_USE_DEPENDENCY
(
${
PROJECT_NAME
}
eigen3
)
INSTALL
(
TARGETS
${
PROJECT_NAME
}
DESTINATION
${
CMAKE_INSTALL_PREFIX
}
/lib
)
INSTALL
(
TARGETS
${
PROJECT_NAME
}
DESTINATION
${
CMAKE_INSTALL_PREFIX
}
/lib
)
# ----------------------------------------------------
# ----------------------------------------------------
...
@@ -94,14 +92,10 @@ ADD_LIBRARY(geometry SHARED unittest/geometry.cpp)
...
@@ -94,14 +92,10 @@ ADD_LIBRARY(geometry SHARED unittest/geometry.cpp)
TARGET_LINK_LIBRARIES
(
geometry
${
Boost_LIBRARIES
}
${
PROJECT_NAME
}
)
TARGET_LINK_LIBRARIES
(
geometry
${
Boost_LIBRARIES
}
${
PROJECT_NAME
}
)
SET_TARGET_PROPERTIES
(
geometry PROPERTIES PREFIX
""
)
SET_TARGET_PROPERTIES
(
geometry PROPERTIES PREFIX
""
)
PKG_CONFIG_APPEND_CFLAGS
(
${
_Eigen_CFLAGS
}
)
PKG_CONFIG_APPEND_CFLAGS
(
"-I
${
PYTHON_INCLUDE_DIRS
}
"
)
PKG_CONFIG_APPEND_CFLAGS
(
"-I
${
PYTHON_INCLUDE_DIRS
}
"
)
PKG_CONFIG_APPEND_CFLAGS
(
"-I
${
NUMPY_INCLUDE_DIRS
}
"
)
PKG_CONFIG_APPEND_CFLAGS
(
"-I
${
NUMPY_INCLUDE_DIRS
}
"
)
#PKG_CONFIG_APPEND_LIBS_RAW(${Boost_LIBRARIES})
PKG_CONFIG_APPEND_LIBS
(
"boost_python"
)
PKG_CONFIG_APPEND_LIBS
(
"boost_python"
)
PKG_CONFIG_APPEND_LIBS_RAW
(
${
PYTHON_LIBRARIES
}
)
PKG_CONFIG_APPEND_LIBS_RAW
(
${
PYTHON_LIBRARIES
}
)
PKG_CONFIG_APPEND_LIBS
(
${
PROJECT_NAME
}
)
PKG_CONFIG_APPEND_LIBS
(
${
PROJECT_NAME
}
)
SETUP_PROJECT_FINALIZE
()
SETUP_PROJECT_FINALIZE
()
SETUP_PROJECT_CPACK
()
This diff is collapsed.
Click to expand it.
eigenpy.pc.cmake
deleted
100644 → 0
+
0
−
13
View file @
b19d6563
prefix=
${
CMAKE_INSTALL_PREFIX
}
exec_prefix=
${
install_pkg_prefix
}
libdir=
${
install_pkg_exec_prefix
}
/lib
includedir=
${
install_pkg_prefix
}
/include
datarootdir=
${
install_pkg_prefix
}
/share
docdir=
${
install_pkg_datarootdir
}
/doc/
${
PROJECT_NAME
}
Name:
${
PROJECT_NAME
}
Description:
Version:
${
PROJECT_VERSION
}
Requires:
${
PACKAGE_REQUIREMENTS
}
Libs:
${
LIBDIR_KW
}${
install_pkg_libdir
}
${${
PROJECT_NAME
}
_LDFLAGS
}
Cflags: -I
${
install_pkg_include_dir
}
${${
PROJECT_NAME
}
_CXXFLAGS
}
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