Unverified Commit b363b53f authored by Kelvin Rodriguez's avatar Kelvin Rodriguez Committed by GitHub
Browse files

Merge pull request #32 from Kelvinrr/conda 

Conda Support 2: Electric Boogaloo
parents 6f6a06e0 44a5dcdf

isis/cmake/FindAllDependencies.cmake

+14 −1
Original line number Diff line number Diff line
@@ -194,15 +194,28 @@ endforeach() 


foreach (_variableName ${_variableNames})

    if (_variableName MATCHES "^CMAKE+")

    elseif (_variableName MATCHES "^BULLET$")

      # We need to skip Bullet since the order needs to be very specific

    elseif (_variableName MATCHES ".+_LIB$")

      list(APPEND ALLLIBS "${${_variableName}}")

    elseif (_variableName MATCHES ".+_LIBRARY$")

      list(APPEND ALLLIBS "${${_variableName}}")

    elseif (_variableName MATCHES ".+_LIBRARIES$")

      list(APPEND ALLLIBS "${${_variableName}}")

    endif(_variableName MATCHES "^CMAKE+")

    endif()

endforeach()



list(APPEND ALLLIBS "${BULLET_OPENCL_LIBRARY}")

list(APPEND ALLLIBS "${BULLET3_COMMON_LIBRARY}")

list(APPEND ALLLIBS "${BULLET3_GEOMETRY_LIBRARY}")

list(APPEND ALLLIBS "${BULLET_SOFTBODY_LIBRARY}")

list(APPEND ALLLIBS "${BULLET_DYNAMICS_LIBRARY}")

list(APPEND ALLLIBS "${BULLET3_3DYNAMICS_LIBRARY}")

list(APPEND ALLLIBS "${BULLET_INVERSEDYNAMICS_LIBRARY}")

list(APPEND ALLLIBS "${BULLET_COLLISION_LIBRARY}")

list(APPEND ALLLIBS "${BULLET3_3COLLISION_LIBRARY}")

list(APPEND ALLLIBS "${BULLET3_LINEARMATH_LIBRARY}")



foreach (_variableName ${_variableNames})

    get_filename_component(LIBDIR "${${_variableName}}" DIRECTORY)

    if (_variableName MATCHES "^CMAKE+")

isis/cmake/FindBullet.cmake

+8 −8
Original line number Diff line number Diff line
@@ -13,12 +13,12 @@ find_path(BULLET_INCLUDE_DIR 
find_library(BULLET_OPENCL_LIBRARY NAMES Bullet3OpenCL_clew)

find_library(BULLET_SOFTBODY_LIBRARY NAMES BulletSoftBody)

find_library(BULLET_INVERSEDYNAMICS_LIBRARY NAMES BulletInverseDynamics)

find_library(BULLET_DYNAMICS_LIBRARY NAMES Bullet3Common)

find_library(BULLET_COLLISION_LIBRARY NAMES BulletDynamics)

find_library(BULLET3_GEOMETRY_LIBRARY NAMES BulletCollision)

find_library(BULLET3_DYNAMICS_LIBRARY NAMES Bullet3Geometry)

find_library(BULLET3_COLLISION_LIBRARY NAMES Bullet3Dynamics)

find_library(BULLET3_COMMON_LIBRARY NAMES Bullet3Collision)

find_library(BULLET_COMMON_LIBRARY NAMES Bullet3Common)

find_library(BULLET_DYNAMICS_LIBRARY NAMES BulletDynamics)

find_library(BULLET3_COLLISION_LIBRARY NAMES BulletCollision)

find_library(BULLET3_3GEOMETRY_LIBRARY NAMES Bullet3Geometry)

find_library(BULLET3_3DYNAMICS_LIBRARY NAMES Bullet3Dynamics)

find_library(BULLET3_3COLLISION_LIBRARY NAMES Bullet3Collision)

find_library(BULLET3_LINEARMATH_LIBRARY NAMES LinearMath)



get_filename_component(BULLET_ROOT_INCLUDE_DIR "${BULLET_INCLUDE_DIR}" DIRECTORY)
@@ -30,7 +30,7 @@ message( "-- BULLET INVERSE DYNAMICS: " ${BULLET_INVERSEDYNAMICS_LIBRARY} ) 
message( "-- BULLET DYNAMICS: " ${BULLET_DYNAMICS_LIBRARY} )

message( "-- BULLET COLLISION: " ${BULLET_COLLISION_LIBRARY} )

message( "-- BULLET GEOMETRY: " ${BULLET3_GEOMETRY_LIBRARY} )

message( "-- BULLET3 DYNAMICS: " ${BULLET3_DYNAMICS_LIBRARY} )

message( "-- BULLET3 COLLISION: " ${BULLET3_COLLISION_LIBRARY} )

message( "-- BULLET3 3DYNAMICS: " ${BULLET3_3DYNAMICS_LIBRARY} )

message( "-- BULLET3 3COLLISION: " ${BULLET3_3COLLISION_LIBRARY} )

message( "-- BULLET3 COMMON: " ${BULLET3_COMMON_LIBRARY} )

message( "-- BULLET3 LINEARMATH: "  ${BULLET3_LINEARMATH_LIBRARY} )

isis/make/config.darwin-MacOSX10_11

+0 −4
Original line number Diff line number Diff line
@@ -373,10 +373,6 @@ NNLIB = -lnn 
#---------------------------------------------------------------------------

# Setup for Bullet Physics library

#---------------------------------------------------------------------------

#BULLETLIB     = -lBullet2FileLoader -lBullet3Collision -lBullet3Common          \

#                -lBullet3Dynamics   -lBullet3Geometry  -lBullet3OpenCL_clew     \

#                -lBulletCollision   -lBulletDynamics   -lBulletInverseDynamics  \

#                -lBulletSoftBody    -lLinearMath

BULLETLIB     = -lBullet3OpenCL_clew     -lBullet3Common    -lBullet3Geometry   \

                -lBulletSoftBody         -lBulletDynamics   -lBullet3Dynamics   \

                -lBulletInverseDynamics  -lBulletCollision  -lBullet3Collision  \