diff options
| author | Ben Reynwar <ben@reynwar.net> | 2012-04-30 09:20:59 -0700 |
|---|---|---|
| committer | Ben Reynwar <ben@reynwar.net> | 2012-04-30 09:20:59 -0700 |
| commit | 2817cf14147d6da2e7ef051fbbbf8228fd1c07ba (patch) | |
| tree | 0695ce3bcdbd75784198c28e6cb963c99ae5d0f6 /cmake/Modules/GrPython.cmake | |
| parent | e7f45e3c513242706a9e4aa36e99e33e79e66d4f (diff) | |
| parent | d7ecbd12be995ad6db7a53a5d6dd3fcb205c07ea (diff) | |
Merge branch 'master' of http://gnuradio.org/git/gnuradio
Diffstat (limited to 'cmake/Modules/GrPython.cmake')
| -rw-r--r-- | cmake/Modules/GrPython.cmake | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/cmake/Modules/GrPython.cmake b/cmake/Modules/GrPython.cmake index eff9cbcdcb..14f2b29cd0 100644 --- a/cmake/Modules/GrPython.cmake +++ b/cmake/Modules/GrPython.cmake @@ -76,12 +76,11 @@ macro(GR_PYTHON_CHECK_MODULE desc mod cmd have) execute_process( COMMAND ${PYTHON_EXECUTABLE} -c " ######################################### -try: import ${mod} -except: - try: ${mod} - except: exit(-1) -try: assert ${cmd} -except: exit(-1) +try: + import ${mod} + assert ${cmd} +except ImportError, AssertionError: exit(-1) +except: pass #########################################" RESULT_VARIABLE ${have} ) |