Skip to content

Fix/gflags shared #3

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.

Sign up for GitHub

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

Open
mmiles19 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix/gflags shared #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f3f9e93
changed find_package gflags to GFlags to prevent linking against gfla…
mmiles19 May 13, 2019
b468ed4
removed commented out BulletPrim
mmiles19 May 13, 2019
8117c94
added run demo script
mmiles19 May 24, 2019
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
28 changes: 19 additions & 9 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ ENDIF()
#the boost libraries that we need
set(BOOST_LIBS thread date_time system timer filesystem)

find_package(PkgConfig REQUIRED)
find_package( PkgConfig REQUIRED )
find_package( Eigen3 REQUIRED )
find_package( Pangolin REQUIRED )
find_package( SceneGraph REQUIRED )
Expand All @@ -31,17 +31,27 @@ find_package( Bullet REQUIRED )
find_package( HAL REQUIRED )
find_package( Boost COMPONENTS ${BOOST_LIBS} REQUIRED)
find_package( QUATLIB REQUIRED )
find_package(Sophus REQUIRED)
find_package( Sophus REQUIRED)
find_package( assimp REQUIRED )
find_package( yaml-cpp REQUIRED )
find_package( gflags REQUIRED )

set( _LIBRARIES ${BULLET_LIBRARIES} ${Boost_LIBRARIES} ${Sophus_LIBRARIES} ${SceneGraph_LIBRARIES} ${CVars_LIBRARIES} ${HAL_LIBRARIES} ${assimp_LIBRARIES} ${YAML_CPP_LIBRARIES} ${GFLAGS_LIBRARIES})
find_package( GFlags REQUIRED )

set( _LIBRARIES
${BULLET_LIBRARIES}
${Boost_LIBRARIES}
${Sophus_LIBRARIES}
${SceneGraph_LIBRARIES}
${CVars_LIBRARIES}
${HAL_LIBRARIES}
${assimp_LIBRARIES}
${YAML_CPP_LIBRARIES}
${GFLAGS_LIBRARIES}
)
set( _INCLUDE_DIRS
${CMAKE_BINARY_DIR}
${Sophus_INCLUDE_DIRS}
${EIGEN3_INCLUDE_DIR}
${CVars_INCLUDE_DIRS}
${CVars_INCLUDE_DIRS}
${BULLET_INCLUDE_DIR}
${assimp_INCLUDE_DIRS}
${SceneGraph_INCLUDE_DIRS}
Expand Down Expand Up @@ -76,7 +86,7 @@ set( SRCS
src/CarController.cpp
src/Localizer.cpp
src/DirectBoundarySolver.cpp
src/BulletPrim.cpp
src/BulletPrim.cpp
)

set( HDRS
Expand All @@ -92,15 +102,15 @@ set( HDRS
include/CarPlanner/DirectBoundarySolver.h
include/CarPlanner/CVarHelpers.h
include/CarPlanner/RpgUtils.h
include/CarPlanner/BulletPrim.h
include/CarPlanner/BulletPrim.h
include/CarPlanner/yaml_eig_conv.h
)

add_library( ${LIBRARY_NAME} SHARED ${SRCS} ${HDRS} )
target_link_libraries( ${LIBRARY_NAME} ${_LIBRARIES} )


add_subdirectory(tests)
#add_subdirectory(tests)

install_package(
PKG_NAME ${PROJECT_NAME}
Expand Down
1 change: 1 addition & 0 deletions run_CarPlanner_demo.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
~/code/MochaGui/build/gui -params ~/code/MochaGui/learning_params.csv -mesh ~/code/MochaGui/labLoop.ply -logfile 1.log -car ~/code/MochaGui/herbie/herbie.blend -wheel ~/code/MochaGui/herbie/wheel.blend