Skip to content

Commit

Permalink
Remove gtk submodule
Browse files Browse the repository at this point in the history
  • Loading branch information
Jamie Snape committed Oct 7, 2016
1 parent 07090bc commit aec124a
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 33 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
[submodule "externals/googletest"]
path = externals/googletest
url = https://github.com/google/googletest.git
[submodule "externals/gtk"]
path = externals/gtk
url = https://github.com/RobotLocomotion/gtk-pod.git
[submodule "externals/lcm"]
path = externals/lcm
url = https://github.com/lcm-proj/lcm.git
Expand Down
34 changes: 5 additions & 29 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,11 @@ option(WITH_GFLAGS "required c++ command-line library. only disable if you have
option(WITH_GOOGLE_STYLEGUIDE "provides cpplint.py style checking" ON)
option(WITH_SWIGMAKE "helper tools to build python & MATLAB wrappers for C++ libraries with Eigen" ON)
option(WITH_BULLET "used for collision detection" ON)
option(WITH_LCM "interprocess communications protocol for visualizers, etc" ON)
option(WITH_BOT_CORE_LCMTYPES "required LCM types library. only disable if you have it already." ON)
option(WITH_SPDLOG "spdlog text logging facility; disabling will turn off text logging." ON)
if(WIN32)
option(WITH_GTK "precompiled gtk binaries/headers for Windows" ON) # needed for lcm on windows
else()
if(NOT WIN32)
option(WITH_DIRECTOR "vtk-based visualization tool and robot user interface" ON) # not win32 yet. it builds on windows, but requires manually installation of vtk, etc. perhaps make a precompiled director pod (a bit like snopt)
option(WITH_LCM "interprocess communications protocol for visualizers, etc" ON)
option(WITH_LIBBOT "simple open-gl visualizer + lcmgl for director" ON) # there is hope, but i spent a long time cleaning up c/c++ language errors trying to make msvc happy.. and still had a long way to go.
option(WITH_NLOPT "nonlinear optimization solver" ON)
option(WITH_DREAL "nonlinear SMT solver" OFF)
Expand Down Expand Up @@ -264,31 +262,10 @@ drake_add_external(iris PUBLIC CMAKE
-DMatlab_ROOT_DIR=${MATLAB_ROOT_DIR}
DEPENDS eigen mosek)

# lcm (and gtk)
if(WIN32)
# On Windows, always build LCM in Release mode for compatibility with the
# Python libraries.
if(CMAKE_CONFIGURATION_TYPES)
# If using a multi-configuration generator, replace the default build
# commands to force the Release configuration to be built.
set(lcm_BUILD_COMMAND ${CMAKE_COMMAND} --build . --config Release)
set(lcm_FORCE_RELEASE_BUILD_COMMANDS
BUILD_COMMAND ${lcm_BUILD_COMMAND}
INSTALL_COMMAND ${lcm_BUILD_COMMAND} --target install)
endif()

drake_add_external(gtk PUBLIC CMAKE)
drake_add_external(lcm PUBLIC CMAKE
${lcm_FORCE_RELEASE_BUILD_COMMANDS}
CMAKE_ARGS
-DBUILD_SHARED_LIBS=ON # Because LCM has no ABI decoration
-DCMAKE_BUILD_TYPE=Release # See above
-DCMAKE_PREFIX_PATH=${CMAKE_CURRENT_SOURCE_DIR}/externals/gtk/gtk3
DEPENDS gtk)
else()
drake_add_external(lcm PUBLIC CMAKE
CMAKE_ARGS -DBUILD_SHARED_LIBS=ON)
endif()
# lcm
drake_add_external(lcm PUBLIC CMAKE
CMAKE_ARGS -DBUILD_SHARED_LIBS=ON)

# libbot
drake_add_external(libbot PUBLIC CMAKE
Expand Down Expand Up @@ -359,7 +336,6 @@ drake_add_external(drake LOCAL PUBLIC CMAKE ALWAYS
gloptipoly
google_styleguide
googletest
gtk
gurobi
ipopt
iris
Expand Down
1 change: 0 additions & 1 deletion externals/gtk
Submodule gtk deleted from 4730a7

0 comments on commit aec124a

Please sign in to comment.