Migrate to Conan 2.x
This commit is contained in:
		
							parent
							
								
									69ef347fe6
								
							
						
					
					
						commit
						2293d13c4c
					
				
							
								
								
									
										4
									
								
								.github/workflows/osrm-backend.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								.github/workflows/osrm-backend.yml
									
									
									
									
										vendored
									
									
								
							| @ -63,7 +63,7 @@ jobs: | ||||
|         ls -la | ||||
| 
 | ||||
|         cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_CONAN=ON -DENABLE_NODE_BINDINGS=ON -DCMAKE_TOOLCHAIN_FILE=./conan_toolchain.cmake .. | ||||
|         # cmake --build . --config Release | ||||
|         cmake --build . --config Release | ||||
|          | ||||
|   #   # TODO: MSVC goes out of memory when building our tests | ||||
|   #   # - name: Run tests | ||||
| @ -537,7 +537,7 @@ jobs: | ||||
|         # sed -i '' 's/compiler.cppstd=.*$/compiler.cppstd=20/' ~/.conan/profiles/default | ||||
| 
 | ||||
|         if [[ "${ENABLE_CONAN}" == "ON" ]]; then | ||||
|           conan install .. --output-folder=. --build=missing --settings compiler.cppstd=20 #--settings build_type=Release | ||||
|           conan install .. --output-folder=. --build=missing --settings compiler.cppstd=20 --settings build_type=${BUILD_TYPE} | ||||
|         fi | ||||
|          | ||||
|         ccache --zero-stats | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user