kill system's eigency
							parent
							
								
									bbd667ad54
								
							
						
					
					
						commit
						a715e064a6
					
				|  | @ -387,8 +387,6 @@ endif() | |||
| # Cython wrap | ||||
| if (GTSAM_INSTALL_CYTHON_TOOLBOX) | ||||
| 	add_subdirectory(cython) | ||||
|   # Option for using system Eigency or GTSAM-bundled Eigency | ||||
|   option(GTSAM_USE_SYSTEM_EIGENCY "Find and use system-installed Eigency. If 'off', use the one bundled with GTSAM" OFF) | ||||
| endif() | ||||
| 
 | ||||
| 
 | ||||
|  | @ -522,13 +520,6 @@ endif() | |||
| message(STATUS "Cython toolbox flags                                      ") | ||||
| print_config_flag(${GTSAM_INSTALL_CYTHON_TOOLBOX}      "Install Cython toolbox         ") | ||||
| print_config_flag(${GTSAM_BUILD_WRAP}                  "Build Wrap                     ") | ||||
| if (GTSAM_INSTALL_CYTHON_TOOLBOX) | ||||
|   if(GTSAM_USE_SYSTEM_EIGENCY) | ||||
|     message(STATUS "  Use System Eigency             : Yes") | ||||
|   else() | ||||
|     message(STATUS "  Use System Eigency             : No") | ||||
|   endif() | ||||
| endif() | ||||
| message(STATUS "===============================================================") | ||||
| 
 | ||||
| # Print warnings at the end | ||||
|  |  | |||
|  | @ -4,14 +4,9 @@ include(GtsamCythonWrap) | |||
| # Create the cython toolbox for the gtsam library | ||||
| if (GTSAM_INSTALL_CYTHON_TOOLBOX) | ||||
|   # build and include eigency | ||||
|   if (GTSAM_USE_SYSTEM_EIGENCY) | ||||
|     find_package(Eigency REQUIRED) | ||||
|     include_directories(${EIGENCY_INCLUDE_DIRS}) | ||||
|   else() | ||||
|     add_subdirectory(eigency) | ||||
|     include_directories(eigency) | ||||
|     file(COPY eigency DESTINATION ".") | ||||
|   endif() | ||||
|   add_subdirectory(eigency) | ||||
|   include_directories(eigency) | ||||
|   file(COPY eigency DESTINATION ".") # so eigency's cython headers can be found when cythonizing gtsam | ||||
| 
 | ||||
|   # wrap gtsam | ||||
|   add_custom_target(gtsam_header DEPENDS "../gtsam.h") | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue