mirror of
				https://github.com/TheLartians/ModernCppStarter.git
				synced 2025-10-31 18:21:35 +01:00 
			
		
		
		
	fix merge problems
prevent testing the cxxopts lib
This commit is contained in:
		
							parent
							
								
									9d1c7413f0
								
							
						
					
					
						commit
						1b3755e6e5
					
				
					 5 changed files with 7 additions and 8 deletions
				
			
		|  | @ -7,8 +7,6 @@ if(NOT PROJECT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR) | |||
| endif() | ||||
| 
 | ||||
| include(${CMAKE_CURRENT_LIST_DIR}/CPM.cmake) | ||||
| CPMUsePackageLock(package-lock.cmake) | ||||
| 
 | ||||
| include(${CMAKE_CURRENT_LIST_DIR}/options.cmake) | ||||
| 
 | ||||
| # option: default not set | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue