diff options
| author | Christoph Koehler <ckoehle@sandia.gov> | 2021-11-03 15:28:38 -0600 |
|---|---|---|
| committer | mormj <34754695+mormj@users.noreply.github.com> | 2021-11-12 07:06:41 -0500 |
| commit | 077cfad67af5549767ff9ddf066f00b72ae8687c (patch) | |
| tree | 99a5fe6d0940597a49d665a2d7c4722712457c60 | |
| parent | e1ce5154560b9e850df4a3c9ba256c601661de31 (diff) | |
modtool: fix CMake export config
Signed-off-by: Christoph Koehler <christoph@zerodeviation.net>
| -rw-r--r-- | gr-utils/modtool/core/base.py | 1 | ||||
| -rw-r--r-- | gr-utils/modtool/templates/gr-newmod/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | gr-utils/modtool/templates/gr-newmod/cmake/Modules/howtoConfig.cmake | 32 |
3 files changed, 1 insertions, 42 deletions
diff --git a/gr-utils/modtool/core/base.py b/gr-utils/modtool/core/base.py index d35bc63156..a8dd55f063 100644 --- a/gr-utils/modtool/core/base.py +++ b/gr-utils/modtool/core/base.py @@ -144,7 +144,6 @@ class ModTool(object): else: self.info['includedir'] = 'include' self._file['cminclude'] = os.path.join(self.info['includedir'], 'CMakeLists.txt') - self._file['cmfind'] = os.path.join('cmake', 'Modules', 'howtoConfig.cmake') def _setup_scm(self, mode='active'): diff --git a/gr-utils/modtool/templates/gr-newmod/CMakeLists.txt b/gr-utils/modtool/templates/gr-newmod/CMakeLists.txt index 1ebfb5b361..3c15e25e3d 100644 --- a/gr-utils/modtool/templates/gr-newmod/CMakeLists.txt +++ b/gr-utils/modtool/templates/gr-newmod/CMakeLists.txt @@ -83,7 +83,7 @@ if(NOT CMAKE_MODULES_DIR) endif(NOT CMAKE_MODULES_DIR) set(GR_INCLUDE_DIR include/howto) -set(GR_CMAKE_DIR ${CMAKE_MODULES_DIR}/howto) +set(GR_CMAKE_DIR ${CMAKE_MODULES_DIR}/gnuradio-howto) set(GR_PKG_DATA_DIR ${GR_DATA_DIR}/${CMAKE_PROJECT_NAME}) set(GR_PKG_DOC_DIR ${GR_DOC_DIR}/${CMAKE_PROJECT_NAME}) set(GR_PKG_CONF_DIR ${GR_CONF_DIR}/${CMAKE_PROJECT_NAME}/conf.d) @@ -150,11 +150,3 @@ if(ENABLE_PYTHON) else(ENABLE_PYTHON) message(STATUS "PYTHON and GRC components are disabled") endif(ENABLE_PYTHON) - -######################################################################## -# Install cmake search helper for this library -######################################################################## - -install(FILES cmake/Modules/howtoConfig.cmake - DESTINATION ${CMAKE_MODULES_DIR}/howto -) diff --git a/gr-utils/modtool/templates/gr-newmod/cmake/Modules/howtoConfig.cmake b/gr-utils/modtool/templates/gr-newmod/cmake/Modules/howtoConfig.cmake deleted file mode 100644 index 4f45052a9f..0000000000 --- a/gr-utils/modtool/templates/gr-newmod/cmake/Modules/howtoConfig.cmake +++ /dev/null @@ -1,32 +0,0 @@ -find_package(PkgConfig) - -PKG_CHECK_MODULES(PC_HOWTO howto) - -FIND_PATH( - HOWTO_INCLUDE_DIRS - NAMES howto/api.h - HINTS $ENV{HOWTO_DIR}/include - ${PC_HOWTO_INCLUDEDIR} - PATHS ${CMAKE_INSTALL_PREFIX}/include - /usr/local/include - /usr/include -) - -FIND_LIBRARY( - HOWTO_LIBRARIES - NAMES gnuradio-howto - HINTS $ENV{HOWTO_DIR}/lib - ${PC_HOWTO_LIBDIR} - PATHS ${CMAKE_INSTALL_PREFIX}/lib - ${CMAKE_INSTALL_PREFIX}/lib64 - /usr/local/lib - /usr/local/lib64 - /usr/lib - /usr/lib64 - ) - -include("${CMAKE_CURRENT_LIST_DIR}/howtoTarget.cmake") - -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(HOWTO DEFAULT_MSG HOWTO_LIBRARIES HOWTO_INCLUDE_DIRS) -MARK_AS_ADVANCED(HOWTO_LIBRARIES HOWTO_INCLUDE_DIRS) |