diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-05-27 11:32:09 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-05-27 11:32:09 -0700 |
| commit | 7b9343b6e5bf119f57dc78104b7988fee4cd9d84 (patch) | |
| tree | f1d647234d3e60e862c61afa01f88052e535192f /gr-utils/python/modtool | |
| parent | 49f4bfbd466a0750534f36677b564af310190081 (diff) | |
| parent | 2325a7d5cbe8bc6049894614f8b1b3f9302cb1bd (diff) | |
Merge remote-tracking branch 'mbr0wn/modtool/versioning'
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 |
2 files changed, 18 insertions, 7 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}") + |