Change CMakelist file to fix merge conflict.
							parent
							
								
									d2209bff30
								
							
						
					
					
						commit
						f5c0830b53
					
				| 
						 | 
				
			
			@ -9,8 +9,8 @@ endif()
 | 
			
		|||
 | 
			
		||||
# Set the version number for the library
 | 
			
		||||
set (GTSAM_VERSION_MAJOR 4)
 | 
			
		||||
set (GTSAM_VERSION_MINOR 0)
 | 
			
		||||
set (GTSAM_VERSION_PATCH 2)
 | 
			
		||||
set (GTSAM_VERSION_MINOR 1)
 | 
			
		||||
set (GTSAM_VERSION_PATCH 0)
 | 
			
		||||
math (EXPR GTSAM_VERSION_NUMERIC "10000 * ${GTSAM_VERSION_MAJOR} + 100 * ${GTSAM_VERSION_MINOR} + ${GTSAM_VERSION_PATCH}")
 | 
			
		||||
set (GTSAM_VERSION_STRING "${GTSAM_VERSION_MAJOR}.${GTSAM_VERSION_MINOR}.${GTSAM_VERSION_PATCH}")
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue