mirror of
				https://github.com/SoftFever/OrcaSlicer.git
				synced 2025-10-30 20:21:12 -06:00 
			
		
		
		
	Revert "Merge branch 'SoftFever' into feature/calib"
This reverts commitf5b28201fe, reversing changes made tod9e9fb2206. # Conflicts: # version.inc
This commit is contained in:
		
							parent
							
								
									de33c24b0a
								
							
						
					
					
						commit
						a688719e72
					
				
					 53 changed files with 1228 additions and 498 deletions
				
			
		|  | @ -293,7 +293,7 @@ if(NOT TBB_FOUND) | |||
|   # Create targets | ||||
|   ################################## | ||||
| 
 | ||||
|   if(NOT CMAKE_VERSION VERSION_LESS 3.0 AND TBB_FOUND AND NOT TARGET TBB::tbb) | ||||
|   if(NOT CMAKE_VERSION VERSION_LESS 3.0 AND TBB_FOUND) | ||||
|     add_library(TBB::tbb UNKNOWN IMPORTED) | ||||
|     set_target_properties(TBB::tbb PROPERTIES | ||||
|           INTERFACE_COMPILE_DEFINITIONS "${TBB_DEFINITIONS}" | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 SoftFever
						SoftFever