diff options
| author | Marcus Müller <marcus.mueller@ettus.com> | 2019-03-08 23:34:46 +0100 |
|---|---|---|
| committer | Marcus Müller <marcus.mueller@ettus.com> | 2019-03-09 00:26:56 +0100 |
| commit | 48691eab0c8593aa2e7decb94ae353992c4894f1 (patch) | |
| tree | 822005b5c4db10f477ffb1fbe42525d1c1c0d8e9 /gr-utils/python | |
| parent | a7aa06a04544e683378b19067b454b018386818f (diff) | |
newmod: Use directories as set by GNU Radio CMake, not guessed yourself
This aims to reconcile what OOTs do at CMake time with what was done at
GNU Radio CMake time.
Diffstat (limited to 'gr-utils/python')
| -rw-r--r-- | gr-utils/python/modtool/templates/gr-newmod/CMakeLists.txt | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/gr-utils/python/modtool/templates/gr-newmod/CMakeLists.txt b/gr-utils/python/modtool/templates/gr-newmod/CMakeLists.txt index 7b44093cbe..0cf7f462a0 100644 --- a/gr-utils/python/modtool/templates/gr-newmod/CMakeLists.txt +++ b/gr-utils/python/modtool/templates/gr-newmod/CMakeLists.txt @@ -71,19 +71,12 @@ if(NOT CMAKE_MODULES_DIR) set(CMAKE_MODULES_DIR lib${LIB_SUFFIX}/cmake) endif(NOT CMAKE_MODULES_DIR) -set(GR_RUNTIME_DIR bin) -set(GR_LIBRARY_DIR lib${LIB_SUFFIX}) set(GR_INCLUDE_DIR include/howto) -SET(GR_CMAKE_DIR ${CMAKE_MODULES_DIR}/howto) -set(GR_DATA_DIR share) +set(GR_CMAKE_DIR ${CMAKE_MODULES_DIR}/howto) set(GR_PKG_DATA_DIR ${GR_DATA_DIR}/${CMAKE_PROJECT_NAME}) -set(GR_DOC_DIR ${GR_DATA_DIR}/doc) set(GR_PKG_DOC_DIR ${GR_DOC_DIR}/${CMAKE_PROJECT_NAME}) -set(GR_CONF_DIR etc) set(GR_PKG_CONF_DIR ${GR_CONF_DIR}/${CMAKE_PROJECT_NAME}/conf.d) -set(GR_LIBEXEC_DIR libexec) set(GR_PKG_LIBEXEC_DIR ${GR_LIBEXEC_DIR}/${CMAKE_PROJECT_NAME}) -set(GRC_BLOCKS_DIR ${GR_PKG_DATA_DIR}/grc/blocks) ######################################################################## # On Apple only, set install name and use rpath correctly, if not already set |