Removed the boost::regex include (not used) from the matlab wrapper & removed any linking to boost::regex
							parent
							
								
									0de62ab879
								
							
						
					
					
						commit
						d1cdafa3f5
					
				|  | @ -116,11 +116,11 @@ if(MSVC) | |||
| 	endif() | ||||
| endif() | ||||
| 
 | ||||
| find_package(Boost 1.43 COMPONENTS serialization system filesystem thread program_options date_time regex timer chrono) | ||||
| find_package(Boost 1.43 COMPONENTS serialization system filesystem thread program_options date_time timer chrono) | ||||
| 
 | ||||
| # Required components | ||||
| if(NOT Boost_SERIALIZATION_LIBRARY OR NOT Boost_SYSTEM_LIBRARY OR NOT Boost_FILESYSTEM_LIBRARY OR | ||||
|     NOT Boost_THREAD_LIBRARY OR NOT Boost_DATE_TIME_LIBRARY OR NOT Boost_REGEX_LIBRARY) | ||||
|     NOT Boost_THREAD_LIBRARY OR NOT Boost_DATE_TIME_LIBRARY) | ||||
|   message(FATAL_ERROR "Missing required Boost components >= v1.43, please install/upgrade Boost or configure your search paths.") | ||||
| endif() | ||||
| 
 | ||||
|  | @ -128,7 +128,7 @@ option(GTSAM_DISABLE_NEW_TIMERS "Disables using Boost.chrono for timing" OFF) | |||
| # Allow for not using the timer libraries on boost < 1.48 (GTSAM timing code falls back to old timer library) | ||||
| set(GTSAM_BOOST_LIBRARIES | ||||
|     ${Boost_SERIALIZATION_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY} | ||||
| 	${Boost_THREAD_LIBRARY} ${Boost_DATE_TIME_LIBRARY} ${Boost_REGEX_LIBRARY}) | ||||
| 	${Boost_THREAD_LIBRARY} ${Boost_DATE_TIME_LIBRARY}) | ||||
| if (GTSAM_DISABLE_NEW_TIMERS) | ||||
|     message("WARNING:  GTSAM timing instrumentation manually disabled") | ||||
|     add_definitions(-DGTSAM_DISABLE_NEW_TIMERS) | ||||
|  |  | |||
|  | @ -128,8 +128,7 @@ function(wrap_library_internal interfaceHeader linkLibraries extraIncludeDirs ex | |||
|     ## This needs to be fixed!! | ||||
|     if(UNIX AND NOT APPLE) | ||||
|       list(APPEND automaticDependencies ${Boost_SERIALIZATION_LIBRARY_RELEASE} ${Boost_FILESYSTEM_LIBRARY_RELEASE} | ||||
|         ${Boost_SYSTEM_LIBRARY_RELEASE} ${Boost_THREAD_LIBRARY_RELEASE} ${Boost_DATE_TIME_LIBRARY_RELEASE} | ||||
|         ${Boost_REGEX_LIBRARY_RELEASE}) | ||||
|         ${Boost_SYSTEM_LIBRARY_RELEASE} ${Boost_THREAD_LIBRARY_RELEASE} ${Boost_DATE_TIME_LIBRARY_RELEASE}) | ||||
|       if(Boost_TIMER_LIBRARY_RELEASE AND NOT GTSAM_DISABLE_NEW_TIMERS) # Only present in Boost >= 1.48.0 | ||||
|         list(APPEND automaticDependencies ${Boost_TIMER_LIBRARY_RELEASE} ${Boost_CHRONO_LIBRARY_RELEASE}) | ||||
|         if(GTSAM_MEX_BUILD_STATIC_MODULE) | ||||
|  |  | |||
|  | @ -18,7 +18,6 @@ | |||
| 
 | ||||
| #include "Argument.h" | ||||
| 
 | ||||
| #include <boost/regex.hpp> | ||||
| #include <boost/lexical_cast.hpp> | ||||
| 
 | ||||
| #include <iostream> | ||||
|  |  | |||
|  | @ -1,6 +1,6 @@ | |||
| # Build/install Wrap | ||||
| 
 | ||||
| set(WRAP_BOOST_LIBRARIES ${Boost_SYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY} ${Boost_THREAD_LIBRARY} ${Boost_REGEX_LIBRARY}) | ||||
| set(WRAP_BOOST_LIBRARIES ${Boost_SYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY} ${Boost_THREAD_LIBRARY}) | ||||
| 
 | ||||
| # Allow for disabling serialization to handle errors related to Clang's linker | ||||
| option(GTSAM_WRAP_SERIALIZATION "If enabled, allows for wrapped objects to be saved via boost.serialization" ON) | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue