diff options
| author | Josh Blum <josh@joshknows.com> | 2011-01-14 10:07:31 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-01-14 10:07:31 -0800 |
| commit | 4818bd27f07acea1e663086d59fbb7d44bd5af81 (patch) | |
| tree | a9cc80e503273c51edd4a374732aa7692a243edc /host/lib | |
| parent | 350c606585a45af79b8c6bf6b0e6753afa1d95d8 (diff) | |
| download | uhd-4818bd27f07acea1e663086d59fbb7d44bd5af81.tar.gz uhd-4818bd27f07acea1e663086d59fbb7d44bd5af81.tar.bz2 uhd-4818bd27f07acea1e663086d59fbb7d44bd5af81.zip | |
uhd: more useful prints for component macro
made libuhd a component so we can just build the docs
do the python tests in the top level cmakelists
misc other tweaks
Diffstat (limited to 'host/lib')
| -rw-r--r-- | host/lib/CMakeLists.txt | 22 | ||||
| -rw-r--r-- | host/lib/convert/CMakeLists.txt | 1 |
2 files changed, 1 insertions, 22 deletions
diff --git a/host/lib/CMakeLists.txt b/host/lib/CMakeLists.txt index 0fe137432..d2845ffda 100644 --- a/host/lib/CMakeLists.txt +++ b/host/lib/CMakeLists.txt @@ -16,27 +16,6 @@ # ######################################################################## -# Check Python Modules -######################################################################## -INCLUDE(UHDPython) - -PYTHON_CHECK_MODULE( - "Python version 2.6 or greater" - "platform" "platform.python_version() >= '2.6'" - HAVE_PYTHON_PLAT_MIN_VERSION -) - -PYTHON_CHECK_MODULE( - "Cheetah templates 2.0.0 or greater" - "Cheetah" "Cheetah.Version >= '2.0.0'" - HAVE_PYTHON_MODULE_CHEETAH -) - -IF(NOT HAVE_PYTHON_PLAT_MIN_VERSION OR NOT HAVE_PYTHON_MODULE_CHEETAH) - MESSAGE(FATAL_ERROR "Error: python requirements not met for the build system.") -ENDIF(NOT HAVE_PYTHON_PLAT_MIN_VERSION OR NOT HAVE_PYTHON_MODULE_CHEETAH) - -######################################################################## # Helpful Macros ######################################################################## MACRO(LIBUHD_APPEND_SOURCES) @@ -128,6 +107,7 @@ LIBUHD_APPEND_SOURCES( ADD_LIBRARY(uhd SHARED ${libuhd_sources}) TARGET_LINK_LIBRARIES(uhd ${Boost_LIBRARIES} ${libuhd_libs}) SET_TARGET_PROPERTIES(uhd PROPERTIES DEFINE_SYMBOL "UHD_DLL_EXPORTS") +SET_TARGET_PROPERTIES(uhd PROPERTIES SOVERSION ${UHD_VERSION_MAJOR}) INSTALL(TARGETS uhd LIBRARY DESTINATION ${LIBRARY_DIR} # .so file diff --git a/host/lib/convert/CMakeLists.txt b/host/lib/convert/CMakeLists.txt index 06f7ba12a..a9f977cdc 100644 --- a/host/lib/convert/CMakeLists.txt +++ b/host/lib/convert/CMakeLists.txt @@ -62,5 +62,4 @@ LIBUHD_PYTHON_GEN_SOURCE( LIBUHD_APPEND_SOURCES( ${CMAKE_CURRENT_SOURCE_DIR}/convert_impl.cpp - ${CMAKE_CURRENT_BINARY_DIR}/convert_general.cpp ) |