version check- change to critical warning

main
Rejeesh Kutty 2017-05-12 09:51:48 -04:00
parent e4ae391237
commit ecfa15bfce
2 changed files with 10 additions and 4 deletions

View File

@ -132,8 +132,11 @@ proc adi_ip_create {ip_name} {
global REQUIRED_VIVADO_VERSION global REQUIRED_VIVADO_VERSION
global IGNORE_VERSION_CHECK global IGNORE_VERSION_CHECK
if {!$IGNORE_VERSION_CHECK && [string compare [version -short] $REQUIRED_VIVADO_VERSION] != 0} { set VIVADO_VERSION [version -short]
return -code error [format "ERROR: This library requires Vivado %s." $REQUIRED_VIVADO_VERSION] if {[string compare $VIVADO_VERSION $REQUIRED_VIVADO_VERSION] != 0} {
puts -nonewline "CRITICAL WARNING: vivado version mismatch; "
puts -nonewline "expected $REQUIRED_VIVADO_VERSION, "
puts -nonewline "got $VIVADO_VERSION.\n"
} }
create_project $ip_name . -force create_project $ip_name . -force

View File

@ -82,8 +82,11 @@ proc adi_project_create {project_name {mode 0}} {
set sys_zynq 2 set sys_zynq 2
} }
if {!$IGNORE_VERSION_CHECK && [string compare [version -short] $REQUIRED_VIVADO_VERSION] != 0} { set VIVADO_VERSION [version -short]
return -code error [format "ERROR: This project requires Vivado %s." $REQUIRED_VIVADO_VERSION] if {[string compare $VIVADO_VERSION $REQUIRED_VIVADO_VERSION] != 0} {
puts -nonewline "CRITICAL WARNING: vivado version mismatch; "
puts -nonewline "expected $REQUIRED_VIVADO_VERSION, "
puts -nonewline "got $VIVADO_VERSION.\n"
} }
if {$mode == 0} { if {$mode == 0} {