diff options
author | Josh Blum <josh@joshknows.com> | 2010-07-16 18:29:16 -0700 |
---|---|---|
committer | Josh Blum <josh@joshknows.com> | 2010-07-16 18:29:16 -0700 |
commit | ef0ca3b183c8526d5895ba918abffc9624bb2290 (patch) | |
tree | 8721d291dffc9dda04374378b47e931119fa4b0b /host/lib | |
parent | e1e3ed670ae4a2f8a4157977631ae8eed88f55b8 (diff) | |
parent | 1f1651ba46e55017bf598f0824b62be5ae2c5fd8 (diff) | |
download | uhd-ef0ca3b183c8526d5895ba918abffc9624bb2290.tar.gz uhd-ef0ca3b183c8526d5895ba918abffc9624bb2290.tar.bz2 uhd-ef0ca3b183c8526d5895ba918abffc9624bb2290.zip |
Merge branch 'package'
Also tweaked pkg config file
Conflicts:
host/CMakeLists.txt
Diffstat (limited to 'host/lib')
-rw-r--r-- | host/lib/CMakeLists.txt | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/host/lib/CMakeLists.txt b/host/lib/CMakeLists.txt index d13c43bfb..cc60dfbba 100644 --- a/host/lib/CMakeLists.txt +++ b/host/lib/CMakeLists.txt @@ -16,32 +16,6 @@ # ######################################################################## -# Setup Python -######################################################################## -INCLUDE(FindPythonInterp) - -MACRO(PYTHON_CHECK_MODULE module have) - MESSAGE(STATUS "Checking for python module ${module}") - EXECUTE_PROCESS( - COMMAND ${PYTHON_EXECUTABLE} -c "import ${module}" - RESULT_VARIABLE ${have} - ) - IF(${have} EQUAL 0) - MESSAGE(STATUS "Checking for python module ${module} - found") - SET(${have} TRUE) - ELSE(${have} EQUAL 0) - MESSAGE(STATUS "Checking for python module ${module} - not found") - SET(${have} FALSE) - ENDIF(${have} EQUAL 0) -ENDMACRO(PYTHON_CHECK_MODULE) - -PYTHON_CHECK_MODULE("Cheetah" HAVE_PYTHON_MODULE_CHEETAH) - -IF(NOT HAVE_PYTHON_MODULE_CHEETAH) - MESSAGE(FATAL_ERROR "Error: Cheetah Templates needed for pre-build generation.") -ENDIF(NOT HAVE_PYTHON_MODULE_CHEETAH) - -######################################################################## # Helpful Macros ######################################################################## MACRO(LIBUHD_APPEND_SOURCES) |