Merge pull request #711 from borglab/feature/matlab-wrap

CMakeLists.txt

@@ -60,17 +60,6 @@ include(cmake/HandleGlobalBuildFlags.cmake) # Build flags
 # Build CppUnitLite
 add_subdirectory(CppUnitLite)
 
-# This is the new wrapper
-if(GTSAM_BUILD_PYTHON)
-    # Need to set this for the wrap package so we don't use the default value.
-    set(WRAP_PYTHON_VERSION ${GTSAM_PYTHON_VERSION}
-        CACHE STRING "The Python version to use for wrapping")
-
-    add_subdirectory(wrap)
-    list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/wrap/cmake")
-    add_subdirectory(python)
-endif()
-
 # Build GTSAM library
 add_subdirectory(gtsam)
 
@@ -88,8 +77,22 @@ if (GTSAM_BUILD_UNSTABLE)
     add_subdirectory(gtsam_unstable)
 endif()
 
+# This is the new wrapper
+if(GTSAM_BUILD_PYTHON OR GTSAM_INSTALL_MATLAB_TOOLBOX)
+    # Need to set this for the wrap package so we don't use the default value.
+    set(WRAP_PYTHON_VERSION ${GTSAM_PYTHON_VERSION}
+        CACHE STRING "The Python version to use for wrapping")
+    add_subdirectory(wrap)
+    list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/wrap/cmake")
+endif()
+
+# Python toolbox
+if(GTSAM_BUILD_PYTHON)
+    add_subdirectory(python)
+endif()
+
 # Matlab toolbox
-if (GTSAM_INSTALL_MATLAB_TOOLBOX)
+if(GTSAM_INSTALL_MATLAB_TOOLBOX)
     add_subdirectory(matlab)
 endif()
 

cmake/CMakeLists.txt

@@ -16,11 +16,8 @@ install(FILES
   dllexport.h.in
   GtsamBuildTypes.cmake
   GtsamMakeConfigFile.cmake
-  GtsamMatlabWrap.cmake
   GtsamTesting.cmake
   GtsamPrinting.cmake
   FindNumPy.cmake
   README.html
   DESTINATION "${SCRIPT_INSTALL_DIR}/GTSAMCMakeTools")
-
-