Skip to content

Commit

Permalink
Fix debian package dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
tobiaskunz committed Dec 10, 2013
1 parent da3202d commit f359e57
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 10 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Expand Up @@ -86,7 +86,7 @@ else()
endif()

# Boost
find_package(Boost REQUIRED system filesystem)
find_package(Boost REQUIRED system)
if(MSVC OR MSVC90 OR MSVC10)
add_definitions(-DBOOST_ALL_NO_LIB)
endif()
Expand Down
6 changes: 4 additions & 2 deletions cmake/FindFCL.cmake
Expand Up @@ -17,10 +17,12 @@ set(FCL_INCLUDE_DIRS ${FCL_INCLUDE_DIR})
if(MSVC)
set(FCL_LIBRARIES optimized fcl debug fcld ccd)
else()
set(FCL_LIBRARIES fcl ccd)
find_library(FCL_LIBRARY fcl)
find_library(CCD_LIBRARY ccd)
set(FCL_LIBRARIES ${FCL_LIBRARY} ${CCD_LIBRARY})
endif()

include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(FCL DEFAULT_MSG FCL_INCLUDE_DIR)

mark_as_advanced(FCL_INCLUDE_DIR)
mark_as_advanced(FCL_INCLUDE_DIR FCL_LIBRARY CCD_LIBRARY)
38 changes: 31 additions & 7 deletions debian/control
@@ -1,18 +1,37 @@
Source: dart
Priority: extra
Maintainer: Tobias Kunz <tobias@gatech.edu>
Build-Depends: debhelper (>= 9), cmake, libflann1.8, libgtest-dev
Build-Depends: debhelper (>= 9),
cmake,
libeigen3-dev,
libfcl-dev (>= 0.2.7),
libassimp-dev (>= 3),
freeglut3-dev,
libxi-dev,
libxmu-dev,
libflann-dev (>= 1.8),
libtinyxml-dev,
libtinyxml2-dev,
libgtest-dev,
liburdfdom-dev
Standards-Version: 3.9.4
Section: libs
Homepage: http://golems.org/node/1526
Vcs-Git: git://git.com/dartsim/dart.git
Homepage: http://dartsim.github.io/
Vcs-Git: git://github.com/dartsim/dart.git
Vcs-Browser: https://github.com/dartsim/dart

Package: libdart-core3-dev
Section: libdevel
Architecture: any
Pre-Depends: multiarch-support
Depends: ${misc:Depends}, libdart-core3.0, libeigen3-dev, libassimp-dev (>=3.0), freeglut3-dev, libxi-dev, libxmu-dev
Depends: ${misc:Depends},
libdart-core3.0 (= ${binary:Version}),
libeigen3-dev,
libassimp-dev (>= 3),
freeglut3-dev,
libxi-dev,
libxmu-dev,
libfcl-dev
Description: Dynamic Animation and Robotics Toolkit, core development files
DART is a collaborative, cross-platform, open source library created by the
Georgia Tech Graphics Lab and Humanoid Robotics Lab. The library provides data
Expand Down Expand Up @@ -41,7 +60,10 @@ Package: libdart3-dev
Section: libdevel
Architecture: any
Pre-Depends: multiarch-support
Depends: ${misc:Depends}, libdart-core3-dev, libdart3.0, libflann-dev, libtinyxml-dev, libtinyxml2-dev, libxi-dev, libxmu-dev
Depends: ${misc:Depends},
libdart-core3-dev,
libdart3.0 (= ${binary:Version}),
libtinyxml2-dev
Description: Dynamic Animation and Robotics Toolkit, development files
DART is a collaborative, cross-platform, open source library created by the
Georgia Tech Graphics Lab and Humanoid Robotics Lab. The library provides data
Expand Down Expand Up @@ -71,7 +93,8 @@ Package: libdart-core3.0
Section: libs
Architecture: any
Pre-Depends: multiarch-support
Depends: ${misc:Depends}, freeglut3, fcl (>= 0.2.7), libassimp3, libxi6, libxmu6
Depends: ${misc:Depends},
${shlibs:Depends}
Description: Dynamic Animation and Robotics Toolkit, core library files
DART is a collaborative, cross-platform, open source library created by the
Georgia Tech Graphics Lab and Humanoid Robotics Lab. The library provides data
Expand Down Expand Up @@ -100,7 +123,8 @@ Package: libdart3.0
Section: libs
Architecture: any
Pre-Depends: multiarch-support
Depends: ${misc:Depends}, libdart-core, urdfdom, libtinyxml2.6.2, libtinyxml2-0.0.0
Depends: ${misc:Depends},
${shlibs:Depends}
Description: Dynamic Animation and Robotics Toolkit, library files
DART is a collaborative, cross-platform, open source library created by the
Georgia Tech Graphics Lab and Humanoid Robotics Lab. The library provides data
Expand Down

0 comments on commit f359e57

Please sign in to comment.