diff options
| author | Josh Blum <josh@joshknows.com> | 2010-10-28 18:34:04 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-10-28 18:34:04 -0700 |
| commit | 92b5034cb5a6e17fe7ebc437f7ef26147d69eba3 (patch) | |
| tree | 57aaeb9964b9d990510aa5cf4a72d67581f0129b /host/config | |
| parent | f9edd3865ca0f61a9e80fd917521b49292d5ecb1 (diff) | |
| parent | a8d2c2944b329218af1c0b171b92f775b679b409 (diff) | |
| download | uhd-92b5034cb5a6e17fe7ebc437f7ef26147d69eba3.tar.gz uhd-92b5034cb5a6e17fe7ebc437f7ef26147d69eba3.tar.bz2 uhd-92b5034cb5a6e17fe7ebc437f7ef26147d69eba3.zip | |
Merge branch 'master' into flow_ctrl
Diffstat (limited to 'host/config')
| -rw-r--r-- | host/config/Python.cmake | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/host/config/Python.cmake b/host/config/Python.cmake index 55ef6acca..a5080fc40 100644 --- a/host/config/Python.cmake +++ b/host/config/Python.cmake @@ -24,26 +24,23 @@ IF(NOT PYTHONINTERP_FOUND) MESSAGE(FATAL_ERROR "Error: Python interpretor required by the build system.") ENDIF(NOT PYTHONINTERP_FOUND) -MACRO(PYTHON_CHECK_MODULE module have) - MESSAGE(STATUS "Checking for python module ${module}") +MACRO(PYTHON_CHECK_MODULE desc mod cmd have) + MESSAGE(STATUS "Python checking for ${desc}") EXECUTE_PROCESS( - COMMAND ${PYTHON_EXECUTABLE} -c "import ${module}" + COMMAND ${PYTHON_EXECUTABLE} -c " +######################################### +try: import ${mod} +except: exit(-1) +try: assert ${cmd} +except: exit(-1) +#########################################" RESULT_VARIABLE ${have} ) IF(${have} EQUAL 0) - MESSAGE(STATUS "Checking for python module ${module} - found") + MESSAGE(STATUS "Python checking for ${desc} - found") SET(${have} TRUE) ELSE(${have} EQUAL 0) - MESSAGE(STATUS "Checking for python module ${module} - not found") + MESSAGE(STATUS "Python checking for ${desc} - not found") SET(${have} FALSE) ENDIF(${have} EQUAL 0) ENDMACRO(PYTHON_CHECK_MODULE) - -######################################################################## -# Check Modules -######################################################################## -PYTHON_CHECK_MODULE("Cheetah" HAVE_PYTHON_MODULE_CHEETAH) - -IF(NOT HAVE_PYTHON_MODULE_CHEETAH) - MESSAGE(FATAL_ERROR "Error: Cheetah Templates required by the build system.") -ENDIF(NOT HAVE_PYTHON_MODULE_CHEETAH) |