Compare commits
	
		
			2 commits
		
	
	
		
			
				877e7ad2fa
			
			...
			
				b3c59ffe0d
			
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
							
							
								
							
							
	
	
		
			
		
	
	b3c59ffe0d | 
						
						
							|||
| 
							
							
								
							
							
	
	
		
			
		
	
	c9cd8b444b | 
						
						
							
					 2 changed files with 6 additions and 3 deletions
				
			
		| 
						 | 
					@ -28,7 +28,7 @@ else ()
 | 
				
			||||||
    message(STATUS "ccache not found")
 | 
					    message(STATUS "ccache not found")
 | 
				
			||||||
endif ()
 | 
					endif ()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
fetchcontent_declare(json URL https://github.com/nlohmann/json/releases/download/v3.11.3/json.tar.xz)
 | 
					fetchcontent_declare(json URL https://github.com/nlohmann/json/releases/download/v3.11.3/json.tar.xz DOWNLOAD_EXTRACT_TIMESTAMP OFF)
 | 
				
			||||||
set(JSON_BuildTests OFF CACHE INTERNAL "")
 | 
					set(JSON_BuildTests OFF CACHE INTERNAL "")
 | 
				
			||||||
option(JSON_ImplicitConversions "Enable implicit conversions." OFF)
 | 
					option(JSON_ImplicitConversions "Enable implicit conversions." OFF)
 | 
				
			||||||
option(JSON_SystemInclude "Include as system headers (skip for clang-tidy)." ON)
 | 
					option(JSON_SystemInclude "Include as system headers (skip for clang-tidy)." ON)
 | 
				
			||||||
| 
						 | 
					@ -63,6 +63,7 @@ set(LINKER_OPTIONS
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
option(ENABLE_COVERAGE "Enabling coverage" OFF)
 | 
					option(ENABLE_COVERAGE "Enabling coverage" OFF)
 | 
				
			||||||
 | 
					option(BILLY_ENABLE_TESTS "Enable Unit testing target" ON)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
if (${ENABLE_COVERAGE})
 | 
					if (${ENABLE_COVERAGE})
 | 
				
			||||||
    message(STATUS "Coverage enabled")
 | 
					    message(STATUS "Coverage enabled")
 | 
				
			||||||
| 
						 | 
					@ -125,4 +126,6 @@ install(FILES
 | 
				
			||||||
        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/billySheet
 | 
					        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/billySheet
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
add_subdirectory("Unit testing")
 | 
					if (${BILLY_ENABLE_TESTS})
 | 
				
			||||||
 | 
					    add_subdirectory("Unit testing")
 | 
				
			||||||
 | 
					endif ()
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										2
									
								
								external/catch2
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								external/catch2
									
										
									
									
										vendored
									
									
								
							| 
						 | 
					@ -1 +1 @@
 | 
				
			||||||
Subproject commit fa43b77429ba76c462b1898d6cd2f2d7a9416b14
 | 
					Subproject commit 914aeecfe23b1e16af6ea675a4fb5dbd5a5b8d0a
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue