Added configuration variable for typedef only
							parent
							
								
									3a7c8542b0
								
							
						
					
					
						commit
						52fff13b6f
					
				|  | @ -66,6 +66,7 @@ option(GTSAM_WITH_EIGEN_MKL_OPENMP       "Eigen, when using Intel MKL, will also | |||
| option(GTSAM_THROW_CHEIRALITY_EXCEPTION "Throw exception when a triangulated point is behind a camera" ON) | ||||
| option(GTSAM_BUILD_PYTHON                "Enable/Disable building & installation of Python module" ON) | ||||
| option(GTSAM_ALLOW_DEPRECATED_SINCE_V4   "Allow use of methods/functions deprecated in GTSAM 4" ON) | ||||
| option(GTSAM_USE_VECTOR3_POINTS          "Symply typdef Point3 to eigen::Vector3d" OFF) | ||||
| 
 | ||||
| # Options relating to MATLAB wrapper | ||||
| # TODO: Check for matlab mex binary before handling building of binaries | ||||
|  | @ -85,7 +86,11 @@ if(GTSAM_INSTALL_MATLAB_TOOLBOX AND GTSAM_BUILD_STATIC_LIBRARY) | |||
| endif() | ||||
| 
 | ||||
| if(GTSAM_BUILD_PYTHON AND GTSAM_ALLOW_DEPRECATED_SINCE_V4) | ||||
| 	message(FATAL_ERROR "GTSAM_BUILD_PYTHON and GTSAM_ALLOW_DEPRECATED_SINCE_V4 are both enabled. The python module cannot be compiled with deprecated functions turned on. Turn one of the two options off.") | ||||
|     message(FATAL_ERROR "GTSAM_BUILD_PYTHON and GTSAM_ALLOW_DEPRECATED_SINCE_V4 are both enabled. The python module cannot be compiled with deprecated functions turned on. Turn one of the two options off.") | ||||
| endif() | ||||
| 
 | ||||
| if(GTSAM_INSTALL_MATLAB_TOOLBOX AND GTSAM_USE_VECTOR3_POINTS) | ||||
|     message(FATAL_ERROR "GTSAM_INSTALL_MATLAB_TOOLBOX and GTSAM_USE_VECTOR3_POINTS are both enabled. For now, the MATLAB toolbox cannot deal with this yet.  Please turn one of the two options off.") | ||||
| endif() | ||||
| 
 | ||||
| # Flags for choosing default packaging tools | ||||
|  | @ -477,6 +482,7 @@ print_config_flag(${GTSAM_ENABLE_CONSISTENCY_CHECKS}   "Runtime consistency chec | |||
| print_config_flag(${GTSAM_ROT3_EXPMAP}                 "Rot3 retract is full ExpMap    ") | ||||
| print_config_flag(${GTSAM_POSE3_EXPMAP}                "Pose3 retract is full ExpMap   ") | ||||
| print_config_flag(${GTSAM_ALLOW_DEPRECATED_SINCE_V4}   "Deprecated in GTSAM 4 allowed  ") | ||||
| print_config_flag(${GTSAM_USE_VECTOR3_POINTS}          "Point3 is typedef to Vector3   ") | ||||
| 
 | ||||
| message(STATUS "MATLAB toolbox flags                                      ") | ||||
| print_config_flag(${GTSAM_INSTALL_MATLAB_TOOLBOX}      "Install matlab toolbox         ") | ||||
|  |  | |||
|  | @ -62,3 +62,6 @@ | |||
| 
 | ||||
| // Make sure dependent projects that want it can see deprecated functions
 | ||||
| #cmakedefine GTSAM_ALLOW_DEPRECATED_SINCE_V4 | ||||
| 
 | ||||
| // Publish flag about Eigen typedef
 | ||||
| #cmakedefine GTSAM_USE_VECTOR3_POINTS | ||||
|  |  | |||
|  | @ -21,6 +21,7 @@ | |||
| 
 | ||||
| #pragma once | ||||
| 
 | ||||
| #include <gtsam/config.h> | ||||
| #include <gtsam/base/VectorSpace.h> | ||||
| #include <gtsam/base/Vector.h> | ||||
| #include <gtsam/dllexport.h> | ||||
|  | @ -28,7 +29,6 @@ | |||
| 
 | ||||
| namespace gtsam { | ||||
| 
 | ||||
| #define GTSAM_USE_VECTOR3_POINTS | ||||
| #ifdef GTSAM_USE_VECTOR3_POINTS | ||||
| 
 | ||||
|   /// As of GTSAM 4, in order to make GTSAM more lean,
 | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue