From 6fb948e9d2577b2b1aff5d76df0d4e84e5bd58b2 Mon Sep 17 00:00:00 2001 From: Richard Roberts Date: Mon, 10 Sep 2012 18:16:59 +0000 Subject: [PATCH 3/4] Changed default to not build matlab toolbox --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5c1c5cdab..afca96736 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -57,7 +57,7 @@ endif() # Options relating to MATLAB wrapper # TODO: Check for matlab mex binary before handling building of binaries -option(GTSAM_INSTALL_MATLAB_TOOLBOX "Enable/Disable installation of matlab toolbox" ON) +option(GTSAM_INSTALL_MATLAB_TOOLBOX "Enable/Disable installation of matlab toolbox" OFF) option(GTSAM_BUILD_WRAP "Enable/Disable building of matlab wrap utility (necessary for matlab interface)" ON) option(GTSAM_INSTALL_WRAP "Enable/Disable installation of wrap utility for wrapping other libraries" ON) set(GTSAM_TOOLBOX_INSTALL_PATH "" CACHE PATH "Matlab toolbox destination, blank defaults to CMAKE_INSTALL_PREFIX/borg/toolbox") From b584db048907e175ac1ec30307e90cb5ff1a3ea5 Mon Sep 17 00:00:00 2001 From: Richard Roberts Date: Mon, 10 Sep 2012 18:55:10 +0000 Subject: [PATCH 4/4] Updated toolbox precompiling flags to enable compiling wrapper, changed file permissions --- package_scripts/compile_static_boost.sh | 0 package_scripts/toolbox_package_unix.sh | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 package_scripts/compile_static_boost.sh mode change 100644 => 100755 package_scripts/toolbox_package_unix.sh diff --git a/package_scripts/compile_static_boost.sh b/package_scripts/compile_static_boost.sh old mode 100644 new mode 100755 diff --git a/package_scripts/toolbox_package_unix.sh b/package_scripts/toolbox_package_unix.sh old mode 100644 new mode 100755 index 6f5cda526..dcca19b01 --- a/package_scripts/toolbox_package_unix.sh +++ b/package_scripts/toolbox_package_unix.sh @@ -31,7 +31,7 @@ if [ -z "$1" -o -z "$2" ]; then fi # Run cmake -cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$PWD/stage" -DBoost_NO_SYSTEM_PATHS:bool=true -DBoost_USE_STATIC_LIBS:bool=true -DBOOST_ROOT="$1" -DGTSAM_BUILD_UNSTABLE:bool=false -DGTSAM_DISABLE_EXAMPLES_ON_INSTALL:bool=true -DGTSAM_DISABLE_TESTS_ON_INSTALL:bool=true -DGTSAM_MEX_BUILD_STATIC_MODULE:bool=true -DMEX_COMMAND="$2" .. +cmake -DCMAKE_BUILD_TYPE=Release -DGTSAM_INSTALL_MATLAB_TOOLBOX:bool=true -DCMAKE_INSTALL_PREFIX="$PWD/stage" -DBoost_NO_SYSTEM_PATHS:bool=true -DBoost_USE_STATIC_LIBS:bool=true -DBOOST_ROOT="$1" -DGTSAM_BUILD_UNSTABLE:bool=false -DGTSAM_DISABLE_EXAMPLES_ON_INSTALL:bool=true -DGTSAM_DISABLE_TESTS_ON_INSTALL:bool=true -DGTSAM_MEX_BUILD_STATIC_MODULE:bool=true -DMEX_COMMAND="$2" .. if [ ! $? ]; then echo "CMake failed"