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

Cmake files added #15

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
bc81514
Added cmake build files and patch for locale settings
JenniferBuehler Jan 9, 2016
86d61cf
Added cmake files only, not including changes with locale yet.
JenniferBuehler Jan 14, 2016
b3701cd
updated cmakelists, now can be used without catkin as well, and compi…
JenniferBuehler Jan 15, 2016
cd16570
Fixes in install include files directives. Now in proper directory st…
JenniferBuehler Jan 16, 2016
1795dea
added PQP_HEADERS as install
JenniferBuehler Jan 16, 2016
afdaacc
updated FindQHull.cmake
JenniferBuehler Feb 2, 2016
da8130f
edited CMakeLists.txt and removed .pro files
Feb 5, 2016
82efbf7
edited package.xml as suggested
Feb 6, 2016
53cc49b
test compiles now
jvarley Feb 6, 2016
9264323
graspit now compiles with c++11 without errors or warnings, tests als…
jvarley Feb 6, 2016
d970158
CMakeLists.txt
jvarley Feb 6, 2016
50fed3d
changed cmake to not conflict with graspit_moveit_plugin
Feb 6, 2016
acf37fc
Merge pull request #3 from jvarley/spacing_in_cmake
JenniferBuehler Feb 6, 2016
5afe7f7
Merge branch 'fixing_tests_with_cmake' of github.com:jvarley/graspit …
jvarley Feb 7, 2016
c6f6144
removed c++11 using qt mutex and mutex guard instead
jvarley Feb 7, 2016
88788a8
Merge pull request #2 from jvarley/fixing_tests_with_cmake
JenniferBuehler Feb 7, 2016
8ab7e07
Merge remote-tracking branch 'upstream/master' into cmake_without_locale
JenniferBuehler Feb 23, 2016
ba01a85
synced with current upstream
JenniferBuehler Feb 23, 2016
02315c5
Merge branch 'cmake_without_locale' of https://github.com/JenniferBue…
JenniferBuehler Feb 23, 2016
62b7cb5
changed so it compiles newest version from upstream
JenniferBuehler Feb 23, 2016
62f9231
static library needs to compile with -fPIC
JenniferBuehler Feb 23, 2016
89c5ea0
static library now optional, false by default
JenniferBuehler Feb 23, 2016
889a6aa
static library now optional, false by default
JenniferBuehler Feb 23, 2016
edcbf2d
compile tests can now be set in cmake command line argument
JenniferBuehler Feb 23, 2016
fc575da
when compiling static library, graspit_simulator needs to include all…
JenniferBuehler Feb 23, 2016
1225783
changes in cmake files required for bloom-release
JenniferBuehler Mar 3, 2016
f8b4e0e
small change to allow compiling on older cmake versions (<2.8.11)
Mar 3, 2016
27e9a75
small comment change
JenniferBuehler Mar 4, 2016
20add8e
merging in new changes related to searchEnergy classes
jvarley Apr 25, 2016
8c66734
fixing merge, fixed cmake to work with bullet
jvarley Apr 27, 2016
5e20433
added findBULLET.cmake
jvarley Apr 27, 2016
a99e0c4
starting to remove catkin references
jvarley Apr 27, 2016
2962448
fixed to use graspit dynamic by default
jvarley Apr 27, 2016
f334588
adding some of the CMakeLists set params to be configurable with ccmake
jvarley Apr 27, 2016
418eb2c
fixed make install to give libgraspit.so correct read permissions
jvarley Apr 27, 2016
74226a9
Merge pull request #6 from CURG/cmake_no_catkin
JenniferBuehler Apr 28, 2016
9b13147
removing package.xml
jvarley Apr 28, 2016
44dbc35
Merge pull request #7 from CURG/cmake_no_catkin
JenniferBuehler May 1, 2016
5aa49c3
Fixed some Windows/MinGW compile issues
May 8, 2016
85b7665
Windows doesn't like ERROR, so renamed to FAILED in task manager file…
JenniferBuehler May 8, 2016
d74cca2
Removed SKIP_SHARED and COMPILE_STATIC flags from CMakeLists.txt
May 8, 2016
5ba9d8a
changes to make plugins work
jvarley May 9, 2016
d60cf85
removing incorrect headers
jvarley May 9, 2016
46c198d
fixing collision flag to work similar to dynamics flag.
jvarley May 9, 2016
7f6c4e8
Merge pull request #8 from jvarley/cmake_plugins
JenniferBuehler May 9, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
923 changes: 923 additions & 0 deletions CMakeLists.txt

Large diffs are not rendered by default.

139 changes: 139 additions & 0 deletions CMakeMacros/FindBULLET.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,139 @@
#.rst:
# FindBullet
# ----------
#
# Try to find the Bullet physics engine
#
#
#
# ::
#
# This module defines the following variables
#
#
#
# ::
#
# BULLET_FOUND - Was bullet found
# BULLET_INCLUDE_DIRS - the Bullet include directories
# BULLET_LIBRARIES - Link to this, by default it includes
# all bullet components (Dynamics,
# Collision, LinearMath, & SoftBody)
#
#
#
# ::
#
# This module accepts the following variables
#
#
#
# ::
#
# BULLET_ROOT - Can be set to bullet install path or Windows build path

#=============================================================================
# Copyright 2009 Kitware, Inc.
# Copyright 2009 Philip Lowman <philip@yhbt.com>
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
#
# This software is distributed WITHOUT ANY WARRANTY; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# See the License for more information.
#=============================================================================
# (To distribute this file outside of CMake, substitute the full
# License text for the above reference.)

macro(_FIND_BULLET_LIBRARY _var)
find_library(${_var}
NAMES
${ARGN}
HINTS
/usr/local/lib/
${BULLET_ROOT}
${BULLET_ROOT}/lib/Release
${BULLET_ROOT}/lib/Debug
${BULLET_ROOT}/out/release8/libs
${BULLET_ROOT}/out/debug8/libs
PATH_SUFFIXES lib
)
mark_as_advanced(${_var})
endmacro()

macro(_BULLET_APPEND_LIBRARIES _list _release)
set(_debug ${_release}_DEBUG)
if(${_debug})
set(${_list} ${${_list}} optimized ${${_release}} debug ${${_debug}})
else()
set(${_list} ${${_list}} ${${_release}})
endif()
endmacro()

find_path(BULLET_INCLUDE_DIR NAMES btBulletCollisionCommon.h
HINTS
${BULLET_ROOT}/include
${BULLET_ROOT}/src
/usr/local/bullet/include
/usr/local/bullet/include
/usr/local/include
/usr/include
PATH_SUFFIXES bullet
)



find_library(BULLET_LIBRARIES
NAMES LinearMath BulletCollision
PATHS
${BULLET_ROOT}/lib
$ENV{COIN3DDIR}/lib
/usr/local/bullet/lib
/usr/local/bullet/lib
/usr/local/lib
)

find_library(BULLET_LIBRARIES
NAMES BulletCollision
PATHS
${BULLET_ROOT}/lib
$ENV{COIN3DDIR}/lib
/usr/local/bullet/lib
/usr/local/bullet/lib
/usr/local/lib
)

# Find the libraries

_FIND_BULLET_LIBRARY(BULLET_DYNAMICS_LIBRARY BulletDynamics)
_FIND_BULLET_LIBRARY(BULLET_DYNAMICS_LIBRARY_DEBUG BulletDynamics_Debug BulletDynamics_d)
_FIND_BULLET_LIBRARY(BULLET_COLLISION_LIBRARY BulletCollision)
_FIND_BULLET_LIBRARY(BULLET_COLLISION_LIBRARY_DEBUG BulletCollision_Debug BulletCollision_d)
_FIND_BULLET_LIBRARY(BULLET_MATH_LIBRARY BulletMath LinearMath)
_FIND_BULLET_LIBRARY(BULLET_MATH_LIBRARY LinearMath LinearMath)
_FIND_BULLET_LIBRARY(BULLET_MATH_LIBRARY_DEBUG BulletMath_Debug BulletMath_d LinearMath_Debug LinearMath_d)
_FIND_BULLET_LIBRARY(BULLET_SOFTBODY_LIBRARY BulletSoftBody)
_FIND_BULLET_LIBRARY(BULLET_SOFTBODY_LIBRARY_DEBUG BulletSoftBody_Debug BulletSoftBody_d)

if(BULLET_INCLUDE_DIR)
set(BULLET_FOUND 1)
message("BULLET FOUND")
endif(BULLET_INCLUDE_DIR)

# handle the QUIETLY and REQUIRED arguments and set BULLET_FOUND to TRUE if
# all listed variables are TRUE
#include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
#FIND_PACKAGE_HANDLE_STANDARD_ARGS(Bullet DEFAULT_MSG
# BULLET_DYNAMICS_LIBRARY BULLET_COLLISION_LIBRARY BULLET_MATH_LIBRARY
# BULLET_SOFTBODY_LIBRARY BULLET_INCLUDE_DIR)

set(BULLET_INCLUDE_DIRS ${BULLET_INCLUDE_DIR})
if(BULLET_FOUND)
_BULLET_APPEND_LIBRARIES(BULLET_LIBRARIES BULLET_DYNAMICS_LIBRARY)
_BULLET_APPEND_LIBRARIES(BULLET_LIBRARIES BULLET_COLLISION_LIBRARY)
_BULLET_APPEND_LIBRARIES(BULLET_LIBRARIES BULLET_MATH_LIBRARY)
_BULLET_APPEND_LIBRARIES(BULLET_LIBRARIES BULLET_SOFTBODY_LIBRARY)
endif()

message("BULLET LIBRARIES: ${BULLET_LIBRARIES}")
97 changes: 97 additions & 0 deletions CMakeMacros/FindQhull.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
###############################################################################
# Find QHULL
#
# This sets the following variables:
# QHULL_FOUND - True if QHULL was found.
# QHULL_INCLUDE_DIRS - Directories containing the QHULL include files.
# QHULL_LIBRARIES - Libraries needed to use QHULL.
# QHULL_DEFINITIONS - Compiler flags for QHULL.
# If QHULL_USE_STATIC is specified then look for static libraries ONLY else
# look for shared ones

set(QHULL_MAJOR_VERSION 6)

if(QHULL_USE_STATIC)
set(QHULL_RELEASE_NAME qhullstatic)
set(QHULL_DEBUG_NAME qhullstatic_d)
else(QHULL_USE_STATIC)
set(QHULL_RELEASE_NAME qhull qhull${QHULL_MAJOR_VERSION})
set(QHULL_DEBUG_NAME qhull_d qhull${QHULL_MAJOR_VERSION}_d qhull_d${QHULL_MAJOR_VERSION})
endif(QHULL_USE_STATIC)

find_file(QHULL_HEADER
NAMES libqhull/libqhull.h qhull.h
HINTS "${QHULL_ROOT}" "$ENV{QHULL_ROOT}" "${QHULL_INCLUDE_DIR}"
PATHS "$ENV{PROGRAMFILES}/QHull" "$ENV{PROGRAMW6432}/QHull"
PATH_SUFFIXES qhull src/libqhull libqhull include)
set(QHULL_HEADER "${QHULL_HEADER}" CACHE INTERNAL "QHull header" FORCE )


find_file(QHULL_A_HEADER
NAMES libqhull/qhull_a.h qhull_a.h
HINTS "${QHULL_ROOT}" "$ENV{QHULL_ROOT}" "${QHULL_INCLUDE_DIR}"
PATHS "$ENV{PROGRAMFILES}/QHull" "$ENV{PROGRAMW6432}/QHull"
PATH_SUFFIXES qhull include)
set(QHULL_A_HEADER "${QHULL_A_HEADER}" CACHE INTERNAL "qhull_a.h file" FORCE )

if(QHULL_HEADER)
get_filename_component(qhull_header ${QHULL_HEADER} NAME_WE)
if("${qhull_header}" STREQUAL "qhull")
set(HAVE_QHULL_2011 OFF)
get_filename_component(QHULL_INCLUDE_DIR ${QHULL_HEADER} PATH)
elseif("${qhull_header}" STREQUAL "libqhull")
set(HAVE_QHULL_2011 ON)
get_filename_component(QHULL_INCLUDE_DIR ${QHULL_HEADER} PATH)
get_filename_component(QHULL_INCLUDE_DIR ${QHULL_INCLUDE_DIR} PATH)
endif()
else(QHULL_HEADER)
set(QHULL_INCLUDE_DIR "QHULL_INCLUDE_DIR-NOTFOUND")
endif(QHULL_HEADER)

if(QHULL_A_HEADER)
get_filename_component(QHULL_A_INCLUDE_DIR ${QHULL_A_HEADER} PATH)
else(QHULL_A_HEADER)
set(QHULL_A_INCLUDE_DIR "QHULL_A_INCLUDE_DIR-NOTFOUND")
endif(QHULL_A_HEADER)

set(QHULL_INCLUDE_DIR "${QHULL_INCLUDE_DIR}" CACHE PATH "QHull include dir." FORCE)
set(QHULL_A_INCLUDE_DIR "${QHULL_A_INCLUDE_DIR}" CACHE PATH "qhull_a.h include dir." FORCE)

find_library(QHULL_LIBRARY
NAMES ${QHULL_RELEASE_NAME}
HINTS "${QHULL_ROOT}" "$ENV{QHULL_ROOT}"
PATHS "$ENV{PROGRAMFILES}/QHull" "$ENV{PROGRAMW6432}/QHull"
PATH_SUFFIXES project build bin lib)

find_library(QHULL_LIBRARY_DEBUG
NAMES ${QHULL_DEBUG_NAME} ${QHULL_RELEASE_NAME}
HINTS "${QHULL_ROOT}" "$ENV{QHULL_ROOT}"
PATHS "$ENV{PROGRAMFILES}/QHull" "$ENV{PROGRAMW6432}/QHull"
PATH_SUFFIXES project build bin lib)

if(NOT QHULL_LIBRARY_DEBUG)
set(QHULL_LIBRARY_DEBUG ${QHULL_LIBRARY})
endif(NOT QHULL_LIBRARY_DEBUG)

set(QHULL_INCLUDE_DIRS
${QHULL_INCLUDE_DIR}
${QHULL_A_INCLUDE_DIR}
)

set(QHULL_LIBRARIES optimized ${QHULL_LIBRARY} debug ${QHULL_LIBRARY_DEBUG})

include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Qhull DEFAULT_MSG QHULL_LIBRARY QHULL_INCLUDE_DIR)

mark_as_advanced(QHULL_LIBRARY QHULL_LIBRARY_DEBUG QHULL_INCLUDE_DIR)

if(QHULL_FOUND)
set(HAVE_QHULL ON)
if(NOT QHULL_USE_STATIC)
add_definitions("-Dqh_QHpointer")
if(MSVC)
add_definitions("-Dqh_QHpointer_dllimport")
endif(MSVC)
endif(NOT QHULL_USE_STATIC)
message(STATUS "QHULL found (include: ${QHULL_INCLUDE_DIRS}, lib: ${QHULL_LIBRARIES})")
endif(QHULL_FOUND)
Loading