diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-05-27 11:58:21 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-05-27 11:58:21 -0700 |
| commit | 8d61a99ff722a707e2807b6a9a6ff84b30a09bf8 (patch) | |
| tree | 8ea8c1ff8eb9d6a3e970ae083abaa06e06210b13 /gr-utils/python/modtool | |
| parent | 5c910950a0c872a52c8dc875b0c108c0f2609c30 (diff) | |
| parent | cc02c4b22a2e17eddfc05863a9f17fb9a5778361 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'gr-utils/python/modtool')
| -rw-r--r-- | gr-utils/python/modtool/gr-newmod/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | gr-utils/python/modtool/gr-newmod/lib/CMakeLists.txt | 16 | ||||
| -rw-r--r-- | gr-utils/python/modtool/modtool_add.py | 5 |
3 files changed, 20 insertions, 10 deletions
diff --git a/gr-utils/python/modtool/gr-newmod/CMakeLists.txt b/gr-utils/python/modtool/gr-newmod/CMakeLists.txt index 6f32f21833..bde9dc0c0f 100644 --- a/gr-utils/python/modtool/gr-newmod/CMakeLists.txt +++ b/gr-utils/python/modtool/gr-newmod/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2011,2012,2014 Free Software Foundation, Inc. +# Copyright 2011,2012,2014,2016 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -40,6 +40,12 @@ set(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} CACHE STRING "") #make sure our local CMake Modules path comes first list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_SOURCE_DIR}/cmake/Modules) +# Set the version information here +set(VERSION_INFO_MAJOR_VERSION 1) +set(VERSION_INFO_API_COMPAT 0) +set(VERSION_INFO_MINOR_VERSION 0) +set(VERSION_INFO_MAINT_VERSION git) + ######################################################################## # Compiler specific setup ######################################################################## @@ -119,6 +125,7 @@ find_package(Doxygen) set(GR_REQUIRED_COMPONENTS RUNTIME) find_package(Gnuradio "3.7.2" REQUIRED) list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_SOURCE_DIR}/cmake/Modules) +include(GrVersion) if(NOT CPPUNIT_FOUND) message(FATAL_ERROR "CppUnit required to compile howto") diff --git a/gr-utils/python/modtool/gr-newmod/lib/CMakeLists.txt b/gr-utils/python/modtool/gr-newmod/lib/CMakeLists.txt index 6192c51f04..10a15b7dd9 100644 --- a/gr-utils/python/modtool/gr-newmod/lib/CMakeLists.txt +++ b/gr-utils/python/modtool/gr-newmod/lib/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2011,2012 Free Software Foundation, Inc. +# Copyright 2011,2012,2016 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -47,11 +47,8 @@ endif(APPLE) ######################################################################## # Install built library files ######################################################################## -install(TARGETS gnuradio-howto - LIBRARY DESTINATION lib${LIB_SUFFIX} # .so/.dylib file - ARCHIVE DESTINATION lib${LIB_SUFFIX} # .lib file - RUNTIME DESTINATION bin # .dll file -) +include(GrMiscUtils) +GR_LIBRARY_FOO(gnuradio-howto RUNTIME_COMPONENT "howto_runtime" DEVEL_COMPONENT "howto_devel") ######################################################################## # Build and register unit test @@ -76,3 +73,10 @@ target_link_libraries( ) GR_ADD_TEST(test_howto test-howto) + +######################################################################## +# Print summary +######################################################################## +message(STATUS "Using install prefix: ${CMAKE_INSTALL_PREFIX}") +message(STATUS "Building for version: ${VERSION} / ${LIBVER}") + diff --git a/gr-utils/python/modtool/modtool_add.py b/gr-utils/python/modtool/modtool_add.py index eb269080b4..d560c0878c 100644 --- a/gr-utils/python/modtool/modtool_add.py +++ b/gr-utils/python/modtool/modtool_add.py @@ -82,9 +82,8 @@ class ModToolAdd(ModTool): if self._info['lang'] is None: while self._info['lang'] not in ['cpp', 'python']: self._info['lang'] = raw_input("Language (python/cpp): ") - - if self._info['lang'] == 'c++': - self._info['lang'] = 'cpp' + if self._info['lang'] == 'c++': + self._info['lang'] = 'cpp' print "Language: %s" % {'cpp': 'C++', 'python': 'Python'}[self._info['lang']] |