mirror of
				https://github.com/SoftFever/OrcaSlicer.git
				synced 2025-10-30 12:11:15 -06:00 
			
		
		
		
	post changes after merging BS1.7.4
Remove tracking etc..
This commit is contained in:
		
							parent
							
								
									e65b11a831
								
							
						
					
					
						commit
						2a478ab4f9
					
				
					 615 changed files with 46215 additions and 54844 deletions
				
			
		
							
								
								
									
										28
									
								
								deps/CGAL/CGAL.cmake
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										28
									
								
								deps/CGAL/CGAL.cmake
									
										
									
									
										vendored
									
									
								
							|  | @ -1,11 +1,31 @@ | |||
| orcaslicer_add_cmake_project( | ||||
|     CGAL | ||||
|     # GIT_REPOSITORY https://github.com/CGAL/cgal.git | ||||
|     # GIT_TAG        caacd806dc55c61cc68adaad99f2240f00493b29 # releases/CGAL-5.3 | ||||
|      GIT_REPOSITORY https://github.com/CGAL/cgal.git | ||||
|      GIT_TAG        caacd806dc55c61cc68adaad99f2240f00493b29 # releases/CGAL-5.3 | ||||
|     # For whatever reason, this keeps downloading forever (repeats downloads if finished) | ||||
|     URL      https://github.com/CGAL/cgal/archive/refs/tags/v5.4.zip | ||||
|     URL_HASH SHA256=d7605e0a5a5ca17da7547592f6f6e4a59430a0bc861948974254d0de43eab4c0 | ||||
|     #URL      https://github.com/CGAL/cgal/archive/releases/CGAL-5.0.zip | ||||
|     #URL_HASH SHA256=c2b035bd078687b6d8c0fb6371a7443adcdb647856af9969532c4050cd5f48e5 | ||||
|     DEPENDS dep_Boost dep_GMP dep_MPFR | ||||
| ) | ||||
| 
 | ||||
| include(GNUInstallDirs) | ||||
| 
 | ||||
| # CGAL, for whatever reason, makes itself non-relocatable by writing the build directory into | ||||
| # CGALConfig-installation-dirs.cmake and including it in configure time. | ||||
| # If this file is not present, it will not consider the stored absolute path | ||||
| ExternalProject_Add_Step(dep_CGAL dep_CGAL_relocation_fix | ||||
|     DEPENDEES install | ||||
| 
 | ||||
|     COMMAND ${CMAKE_COMMAND} -E remove CGALConfig-installation-dirs.cmake | ||||
|     WORKING_DIRECTORY "${DESTDIR}/usr/local/${CMAKE_INSTALL_LIBDIR}/cmake/CGAL" | ||||
| ) | ||||
| 
 | ||||
| # Again, for whatever reason, CGAL thinks that its version is not relevant if | ||||
| # configured as a header only library. Fixing it by placing a cmake version file | ||||
| # besides the installed config file. | ||||
| ExternalProject_Add_Step(dep_CGAL dep_CGAL_version_fix | ||||
|     DEPENDEES install | ||||
| 
 | ||||
|     COMMAND ${CMAKE_COMMAND} -E copy cgal/CGALConfigVersion.cmake "${DESTDIR}/usr/local/${CMAKE_INSTALL_LIBDIR}/cmake/CGAL/CGALConfigVersion.cmake" | ||||
|     WORKING_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}" | ||||
| ) | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 SoftFever
						SoftFever