Respect DISABLE_PYTHON

PYTHON_EXECUTABLE will always be true
yeunghhh · Nov 23, 2016 · e98b0d5 · e98b0d5
1 parent d942e81
commit e98b0d5
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -207,6 +207,7 @@ drake_add_external(drake LOCAL PUBLIC CMAKE ALWAYS TEST MATLAB PYTHON
   BINARY_DIR ${PROJECT_BINARY_DIR}/drake
   CMAKE_ARGS
     -DDISABLE_MATLAB:BOOL=${DISABLE_MATLAB}
+    -DDISABLE_PYTHON:BOOL=${DISABLE_PYTHON}
     -DWITH_AVL:BOOL=${WITH_AVL}
     -DWITH_BOT_CORE_LCMTYPES:BOOL=${WITH_BOT_CORE_LCMTYPES}
     -DWITH_BULLET:BOOL=${WITH_BULLET}

diff --git a/drake/bindings/CMakeLists.txt b/drake/bindings/CMakeLists.txt
@@ -5,7 +5,7 @@ find_program(SWIG_EXECUTABLE swig
   PATHS ${CMAKE_INSTALL_PREFIX}/bin NO_DEFAULT_PATH)
 if(SWIG_EXECUTABLE)
   add_subdirectory(swig)
-  if(PYTHON_EXECUTABLE)
+  if(NOT DISABLE_PYTHON)
     add_subdirectory(python)
   endif()
   add_subdirectory(matlab/test)

diff --git a/drake/bindings/swig/CMakeLists.txt b/drake/bindings/swig/CMakeLists.txt
@@ -31,7 +31,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-misleading-indentation")
 endif()
 
-if(PYTHON_EXECUTABLE)
+if(NOT DISABLE_PYTHON)
   include(SwigPython)
   set(python_install_subdir lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/dist-packages ${CMAKE_CURRENT_SOURCE_DIR}/../python)
 

diff --git a/drake/lcmtypes/CMakeLists.txt b/drake/lcmtypes/CMakeLists.txt
@@ -1,17 +1,25 @@
 include(GenerateExportHeader)
 include(${LCM_USE_FILE})
 
+if(NOT DISABLE_PYTHON)
+  set(python_args PYTHON_SOURCES python_install_sources)
+else()
+  set(python_args)
+endif()
+
 if(JAVA_FOUND)
   set(java_args JAVA_SOURCES java_sources)
+else()
+  set(java_args)
 endif()
 
 lcm_wrap_types(
   C_EXPORT drake_lcmtypes
   C_SOURCES c_sources
   C_HEADERS c_install_headers
   CPP_HEADERS cpp_install_headers
-  PYTHON_SOURCES python_install_sources
   ${java_args}
+  ${python_args}
   lcmt_body_acceleration.lcm
   lcmt_body_motion_data.lcm
   lcmt_body_wrench_data.lcm
@@ -84,7 +92,9 @@ install(TARGETS drake_lcmtypes drakeLCMTypes
   INCLUDES DESTINATION "${DRAKE_INSTALL_INCLUDE_DIR}/lcmtypes"
 )
 
-lcm_install_python(${python_install_sources})
+if(NOT DISABLE_PYTHON)
+  lcm_install_python(${python_install_sources})
+endif()
 
 if(JAVA_FOUND)
   if(NOT TARGET lcm-java)