Merge branch 'alex85k-develop' into develop
This commit is contained in:
		
						commit
						30e9b4513a
					
				| @ -38,7 +38,7 @@ build_script: | |||||||
|   - set TBB_ARCH_PLATFORM=intel64/vc12 |   - set TBB_ARCH_PLATFORM=intel64/vc12 | ||||||
|   - cmake .. -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=%Configuration% -DBZIP2_INCLUDE_DIR=%P%/libs/include -DBZIP2_LIBRARIES=%P%/libs/lib/libbz2.lib -DCMAKE_INSTALL_PREFIX=%P%/libs -DBOOST_ROOT=%P%/boost_min -DBoost_USE_STATIC_LIBS=ON |   - cmake .. -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=%Configuration% -DBZIP2_INCLUDE_DIR=%P%/libs/include -DBZIP2_LIBRARIES=%P%/libs/lib/libbz2.lib -DCMAKE_INSTALL_PREFIX=%P%/libs -DBOOST_ROOT=%P%/boost_min -DBoost_USE_STATIC_LIBS=ON | ||||||
|   - nmake |   - nmake | ||||||
|   - 7z a %P%/osrm_%Configuration%.zip *.exe *.pdb %P%/libs/bin/*.dll -tzip |   - if "APPVEYOR_REPO_BRANCH"=="develop" (7z a %P%/osrm_%Configuration%.zip *.exe *.pdb %P%/libs/bin/*.dll -tzip) | ||||||
| 
 | 
 | ||||||
| test: off | test: off | ||||||
| 
 | 
 | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user