From 5e8b0752a41f836f82c64a2c4e25a3786259b60e Mon Sep 17 00:00:00 2001
From: Josh Blum <josh@joshknows.com>
Date: Wed, 13 Apr 2011 16:10:34 -0700
Subject: uhd: python messages more verbose + print boost configuration info

---
 host/CMakeLists.txt          |  6 ++++++
 host/Modules/UHDPython.cmake | 27 ++++++++++++++++++++++-----
 2 files changed, 28 insertions(+), 5 deletions(-)

(limited to 'host')

diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt
index 552fe492c..6b342c2d3 100644
--- a/host/CMakeLists.txt
+++ b/host/CMakeLists.txt
@@ -102,6 +102,8 @@ ENDIF(WIN32)
 ########################################################################
 # Setup Boost
 ########################################################################
+MESSAGE(STATUS "")
+MESSAGE(STATUS "Configuring Boost C++ Libraries...")
 SET(BOOST_REQUIRED_COMPONENTS
     date_time
     filesystem
@@ -131,6 +133,10 @@ FIND_PACKAGE(Boost 1.36 COMPONENTS ${BOOST_REQUIRED_COMPONENTS})
 INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
 LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
 
+MESSAGE(STATUS "Boost include directories: ${Boost_INCLUDE_DIRS}")
+MESSAGE(STATUS "Boost library directories: ${Boost_LIBRARY_DIRS}")
+MESSAGE(STATUS "Boost libraries: ${Boost_LIBRARIES}")
+
 ########################################################################
 # Check Python Modules
 ########################################################################
diff --git a/host/Modules/UHDPython.cmake b/host/Modules/UHDPython.cmake
index 90a778609..fdcdccb4b 100644
--- a/host/Modules/UHDPython.cmake
+++ b/host/Modules/UHDPython.cmake
@@ -15,9 +15,14 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+IF(NOT DEFINED INCLUDED_UHD_PYTHON_CMAKE)
+SET(INCLUDED_UHD_PYTHON_CMAKE TRUE)
+
 ########################################################################
 # Setup Python
 ########################################################################
+MESSAGE(STATUS "")
+MESSAGE(STATUS "Configuring the python interpreter...")
 #this allows the user to override PYTHON_EXECUTABLE
 IF(PYTHON_EXECUTABLE)
 
@@ -42,6 +47,9 @@ ENDIF(PYTHON_EXECUTABLE)
 #make the path to the executable appear in the cmake gui
 SET(PYTHON_EXECUTABLE ${PYTHON_EXECUTABLE} CACHE FILEPATH "python interpreter")
 
+MESSAGE(STATUS "Python interpreter: ${PYTHON_EXECUTABLE}")
+MESSAGE(STATUS "Override with: -DPYTHON_EXECUTABLE=<path-to-python>")
+
 IF(NOT PYTHONINTERP_FOUND)
     MESSAGE(FATAL_ERROR "Error: Python interpretor required by the build system.")
 ENDIF(NOT PYTHONINTERP_FOUND)
@@ -53,17 +61,26 @@ MACRO(PYTHON_CHECK_MODULE desc mod cmd have)
         COMMAND ${PYTHON_EXECUTABLE} -c "
 #########################################
 try: import ${mod}
-except: exit(-1)
+except: exit(1)
 try: assert ${cmd}
-except: exit(-1)
+except: exit(2)
+exit(0)
 #########################################"
         RESULT_VARIABLE ${have}
     )
     IF(${have} EQUAL 0)
         MESSAGE(STATUS "Python checking for ${desc} - found")
         SET(${have} TRUE)
-    ELSE(${have} EQUAL 0)
-        MESSAGE(STATUS "Python checking for ${desc} - not found")
+    ELSEIF(${have} EQUAL 1)
+        MESSAGE(STATUS "Python checking for ${desc} - \"import ${mod}\" failed")
+        SET(${have} FALSE)
+    ELSEIF(${have} EQUAL 2)
+        MESSAGE(STATUS "Python checking for ${desc} - \"assert ${cmd}\" failed")
         SET(${have} FALSE)
-    ENDIF(${have} EQUAL 0)
+    ELSE()
+        MESSAGE(STATUS "Python checking for ${desc} - unknown error")
+        SET(${have} FALSE)
+    ENDIF()
 ENDMACRO(PYTHON_CHECK_MODULE)
+
+ENDIF(NOT DEFINED INCLUDED_UHD_PYTHON_CMAKE)
-- 
cgit v1.2.3