From 651301f7c0dc3ea58d2b770baeb8de0f42ceb609 Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Sun, 5 Feb 2012 10:27:47 -0800 Subject: howto: various fixes cmake, cleanup * Fixed include dir variable, now works when gnuradio-core in custom prefix * Removed QUIET option, only works for cmake >=2.8.2, Ubuntu LTS has 2.8.0 * Fixed library name for gruel search --- gr-howto-write-a-block-cmake/cmake/Modules/FindGnuradioCore.cmake | 4 ++-- gr-howto-write-a-block-cmake/cmake/Modules/FindGruel.cmake | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'gr-howto-write-a-block-cmake') diff --git a/gr-howto-write-a-block-cmake/cmake/Modules/FindGnuradioCore.cmake b/gr-howto-write-a-block-cmake/cmake/Modules/FindGnuradioCore.cmake index b45cf95e6..3773588a7 100644 --- a/gr-howto-write-a-block-cmake/cmake/Modules/FindGnuradioCore.cmake +++ b/gr-howto-write-a-block-cmake/cmake/Modules/FindGnuradioCore.cmake @@ -1,11 +1,11 @@ INCLUDE(FindPkgConfig) -PKG_CHECK_MODULES(PC_GNURADIO_CORE QUIET gnuradio-core) +PKG_CHECK_MODULES(PC_GNURADIO_CORE gnuradio-core) FIND_PATH( GNURADIO_CORE_INCLUDE_DIRS NAMES gr_random.h HINTS $ENV{GNURADIO_CORE_DIR}/include/gnuradio - ${PC_GNURADIO_CORE_INCLUDE_DIR} + ${PC_GNURADIO_CORE_INCLUDEDIR} PATHS /usr/local/include/gnuradio /usr/include/gnuradio ) diff --git a/gr-howto-write-a-block-cmake/cmake/Modules/FindGruel.cmake b/gr-howto-write-a-block-cmake/cmake/Modules/FindGruel.cmake index 56b8b1773..58dff7044 100644 --- a/gr-howto-write-a-block-cmake/cmake/Modules/FindGruel.cmake +++ b/gr-howto-write-a-block-cmake/cmake/Modules/FindGruel.cmake @@ -1,11 +1,11 @@ INCLUDE(FindPkgConfig) -PKG_CHECK_MODULES(PC_GRUEL QUIET gnuradio-core) +PKG_CHECK_MODULES(PC_GRUEL gruel) FIND_PATH( GRUEL_INCLUDE_DIRS NAMES gruel/attributes.h HINTS $ENV{GRUEL_DIR}/include - ${PC_GRUEL_INCLUDE_DIR} + ${PC_GRUEL_INCLUDEDIR} PATHS /usr/local/include /usr/include ) -- cgit From 3e030d338bb6d6213b3aac0ae66da3f02321e5dd Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Mon, 6 Feb 2012 11:11:04 -0800 Subject: howto: fix cmake swig header installation --- gr-howto-write-a-block-cmake/swig/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gr-howto-write-a-block-cmake') diff --git a/gr-howto-write-a-block-cmake/swig/CMakeLists.txt b/gr-howto-write-a-block-cmake/swig/CMakeLists.txt index 8691942fa..ac5f700f1 100644 --- a/gr-howto-write-a-block-cmake/swig/CMakeLists.txt +++ b/gr-howto-write-a-block-cmake/swig/CMakeLists.txt @@ -53,5 +53,5 @@ install( FILES howto_swig.i ${CMAKE_CURRENT_BINARY_DIR}/howto_swig_doc.i - DESTINATION $(GR_INCLUDE_DIR)/howto/swig + DESTINATION ${GR_INCLUDE_DIR}/howto/swig ) -- cgit From ce7d3555a1a550e29d20af1669a9c9d1e71c8c36 Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Fri, 10 Feb 2012 11:06:44 -0500 Subject: cmake: adding uninstall target for howto-write-a-block-cmake. --- gr-howto-write-a-block-cmake/CMakeLists.txt | 14 +++++++++- .../cmake/cmake_uninstall.cmake.in | 32 ++++++++++++++++++++++ 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 gr-howto-write-a-block-cmake/cmake/cmake_uninstall.cmake.in (limited to 'gr-howto-write-a-block-cmake') diff --git a/gr-howto-write-a-block-cmake/CMakeLists.txt b/gr-howto-write-a-block-cmake/CMakeLists.txt index 9d2d18258..58285ae8f 100644 --- a/gr-howto-write-a-block-cmake/CMakeLists.txt +++ b/gr-howto-write-a-block-cmake/CMakeLists.txt @@ -114,6 +114,18 @@ link_directories( set(GR_HOWTO_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include CACHE INTERNAL "" FORCE) set(GR_HOWTO_SWIG_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/swig CACHE INTERNAL "" FORCE) +######################################################################## +# Create uninstall target +######################################################################## +configure_file( + ${CMAKE_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in + ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake +@ONLY) + +add_custom_target(uninstall + ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake +) + ######################################################################## # Add subdirectories ######################################################################## @@ -123,4 +135,4 @@ add_subdirectory(swig) add_subdirectory(python) add_subdirectory(grc) add_subdirectory(apps) -add_subdirectory(docs) \ No newline at end of file +add_subdirectory(docs) diff --git a/gr-howto-write-a-block-cmake/cmake/cmake_uninstall.cmake.in b/gr-howto-write-a-block-cmake/cmake/cmake_uninstall.cmake.in new file mode 100644 index 000000000..9ae1ae4bd --- /dev/null +++ b/gr-howto-write-a-block-cmake/cmake/cmake_uninstall.cmake.in @@ -0,0 +1,32 @@ +# http://www.vtk.org/Wiki/CMake_FAQ#Can_I_do_.22make_uninstall.22_with_CMake.3F + +IF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt") + MESSAGE(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"") +ENDIF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt") + +FILE(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files) +STRING(REGEX REPLACE "\n" ";" files "${files}") +FOREACH(file ${files}) + MESSAGE(STATUS "Uninstalling \"$ENV{DESTDIR}${file}\"") + IF(EXISTS "$ENV{DESTDIR}${file}") + EXEC_PROGRAM( + "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\"" + OUTPUT_VARIABLE rm_out + RETURN_VALUE rm_retval + ) + IF(NOT "${rm_retval}" STREQUAL 0) + MESSAGE(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}${file}\"") + ENDIF(NOT "${rm_retval}" STREQUAL 0) + ELSEIF(IS_SYMLINK "$ENV{DESTDIR}${file}") + EXEC_PROGRAM( + "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\"" + OUTPUT_VARIABLE rm_out + RETURN_VALUE rm_retval + ) + IF(NOT "${rm_retval}" STREQUAL 0) + MESSAGE(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}${file}\"") + ENDIF(NOT "${rm_retval}" STREQUAL 0) + ELSE(EXISTS "$ENV{DESTDIR}${file}") + MESSAGE(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.") + ENDIF(EXISTS "$ENV{DESTDIR}${file}") +ENDFOREACH(file) -- cgit From 6410e390949ad760356f47e1f5a2dea97190a227 Mon Sep 17 00:00:00 2001 From: Marcus Mueller Date: Fri, 10 Feb 2012 11:15:47 -0500 Subject: docs: applying operator fix to howto-write-a-block, too. --- gr-howto-write-a-block-cmake/docs/doxygen/swig_doc.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gr-howto-write-a-block-cmake') diff --git a/gr-howto-write-a-block-cmake/docs/doxygen/swig_doc.py b/gr-howto-write-a-block-cmake/docs/doxygen/swig_doc.py index 5034099e3..62c8437e1 100644 --- a/gr-howto-write-a-block-cmake/docs/doxygen/swig_doc.py +++ b/gr-howto-write-a-block-cmake/docs/doxygen/swig_doc.py @@ -98,6 +98,8 @@ def make_entry(obj, name=None, templ="{description}", description=None): """ if name is None: name=obj.name() + if "operator " in name: + return '' if description is None: description = combine_descriptions(obj) docstring = templ.format(description=description) -- cgit