Merge pull request RobotLocomotion#4141 from mwoehlke-kitware/shared-…

…option Move SHARED option to superbuild
yeunghhh · Nov 18, 2016 · 45b035f · 45b035f
2 parents d50d486 + d39d195
commit 45b035f
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -60,7 +60,7 @@ drake_add_external(ccd PUBLIC CMAKE
 
 # dreal
 drake_add_external(dreal PUBLIC CMAKE
-  CMAKE_ARGS -DUSE_NLOPT=OFF -DBUILD_TESTING=OFF
+  CMAKE_ARGS -DUSE_NLOPT=OFF -DBUILD_TESTING=OFF -DSUPPORT_ODE=OFF
   SOURCE_SUBDIR src)
 
 # gflags

diff --git a/cmake/config.cmake b/cmake/config.cmake
@@ -241,8 +241,9 @@ macro(drake_setup_platform)
   # Ensure that find_package() searches in the install directory first.
   list(APPEND CMAKE_PREFIX_PATH "${CMAKE_INSTALL_PREFIX}")
 
-  # Set default lib directory name suffix.
-  set(LIB_SUFFIX "" CACHE STRING "lib directory name suffix")
+  # Set default lib directory name suffix
+  set(LIB_SUFFIX "" CACHE STRING
+    "Suffix of library install directory, e.g. '64'")
   mark_as_advanced(LIB_SUFFIX)
 
   drake_setup_compiler()
@@ -251,12 +252,15 @@ macro(drake_setup_platform)
   drake_setup_java()
   drake_setup_python()
 
-  # Set default build
+  # Set default build type
   if(NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE "Release" CACHE STRING
       "The type of build. Options are: Debug Release RelWithDebInfo MinSizeRel."
       FORCE)
   endif()
+
+  # Build shared libraries by default
+  option(BUILD_SHARED_LIBS "Build shared libraries" ON)
 endmacro()
 
 #------------------------------------------------------------------------------

diff --git a/drake/CMakeLists.txt b/drake/CMakeLists.txt
@@ -28,7 +28,6 @@ if(CMAKE_NINJA_LINK_POOL_SIZE GREATER 0)
 endif()
 
 # options
-option(BUILD_SHARED_LIBS "Build Drake with shared libraries." ON)
 option(LONG_RUNNING_TESTS "some tests should be run nightly for coverage, but are too slow for CI" OFF)
 
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)

diff --git a/externals/avl b/externals/avl
diff --git a/externals/dreal b/externals/dreal
diff --git a/externals/xfoil b/externals/xfoil
+6 −1		CMakeLists.txt
+1 −0		avl-config.cmake.in
+1 −17		plotlib/CMakeLists.txt
+44 −33		src/CMakeLists.txt
+22 −61		src/cmake/Modules/FindGLPK.cmake
+7 −1		src/contractor/CMakeLists.txt
+6 −0		src/contractor/contractor_common.cpp
+1 −1		src/contractor/contractor_common.h
+1 −1		src/dreal-config.cmake.in
+1 −0		src/icp/mcss_icp.cpp
+100 −39		src/opensmt/egraph/EgraphStore.C
+14 −0		src/opensmt/parsers/smt2/smt2parser.yy
+5 −3		src/tests/contractor/CMakeLists.txt
+14 −0		src/tests/nra/fabian_01.smt2
+1 −0		src/tests/nra/fabian_01.smt2.expected
+3 −0		src/util/cxx11_check.cpp
+2 −0		src/util/strategy.cpp