diff options
| -rw-r--r-- | .gitmodules | 6 | ||||
| -rw-r--r-- | CMakeLists.txt | 30 | ||||
| m--------- | grex | 0 | ||||
| m--------- | grextras | 0 |
4 files changed, 11 insertions, 25 deletions
diff --git a/.gitmodules b/.gitmodules index 1268fcd..ae5e210 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,6 +10,6 @@ [submodule "gnuradio"] path = gnuradio url = http://github.com/guruofquality/gnuradio.git -[submodule "grextras"] - path = grextras - url = http://github.com/guruofquality/grextras.git +[submodule "grex"] + path = grex + url = http://github.com/guruofquality/grex.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 14dd321..7e830ce 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,7 +24,7 @@ GRAS_CHECK_SUBMODULE(Theron) GRAS_CHECK_SUBMODULE(Apology) GRAS_CHECK_SUBMODULE(PMC) GRAS_CHECK_SUBMODULE(gnuradio) -GRAS_CHECK_SUBMODULE(grextras) +GRAS_CHECK_SUBMODULE(grex) list(APPEND CMAKE_MODULE_PATH ${GRAS_SOURCE_DIR}/PMC/cmake/Modules) list(APPEND CMAKE_MODULE_PATH ${GRAS_SOURCE_DIR}/cmake/Modules) @@ -155,8 +155,8 @@ list(APPEND CMAKE_MODULE_PATH ${GRAS_SOURCE_DIR}/cmake/Modules) list(APPEND CMAKE_MODULE_PATH ${GRAS_BINARY_DIR}/cmake/Modules) set(GRAS_ROOT ${GRAS_SOURCE_DIR}) list(APPEND GRAS_TEST_ENVIRONS "GRAS_ROOT=${GRAS_SOURCE_DIR}") -set(CMAKE_SOURCE_DIR ${GRAS_SOURCE_DIR}/grextras) -set(CMAKE_BINARY_DIR ${GRAS_BINARY_DIR}/grextras) +set(CMAKE_SOURCE_DIR ${GRAS_SOURCE_DIR}/grex) +set(CMAKE_BINARY_DIR ${GRAS_BINARY_DIR}/grex) set(GRAS_FOUND TRUE) #GRAS_INCLUDE_DIRS, GRAS_LIBRARIES set above @@ -208,34 +208,20 @@ list(APPEND GRAS_TEST_TARGET_DEPS "${GR_TEST_TARGET_DEPS}") list(APPEND GRAS_TEST_LIBRARY_DIRS "${GR_TEST_LIBRARY_DIRS}") list(APPEND GRAS_TEST_PYTHON_DIRS "${GR_TEST_PYTHON_DIRS}") -add_subdirectory(grextras) +add_subdirectory(grex) ######################################################################## -# add GrExtras to gnuradio cpack registry +# add GrEx to gnuradio cpack registry # this must come after the submodule ######################################################################## list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Modules) include(GrPackage) -CPACK_SET(CPACK_COMPONENT_GROUP_GREXTRAS_DESCRIPTION "GNU Radio Extras") +CPACK_SET(CPACK_COMPONENT_GROUP_GREXTRAS_DESCRIPTION "GrEx") -CPACK_COMPONENT("extras_runtime" - GROUP "GrExtras" +CPACK_COMPONENT("grex" + GROUP "GrEx" DISPLAY_NAME "Runtime" DESCRIPTION "Runtime" DEPENDS "${GRAS_RUNTIME}" ) - -CPACK_COMPONENT("extras_devel" - GROUP "GrExtras" - DISPLAY_NAME "Development" - DESCRIPTION "C++ headers and import libraries" - DEPENDS "${GRAS_COMP_DEVEL}" -) - -CPACK_COMPONENT("extras_python" - GROUP "GrExtras" - DISPLAY_NAME "Python" - DESCRIPTION "Python modules for runtime" - DEPENDS "extras_runtime;${GRAS_COMP_PYTHON}" -) diff --git a/grex b/grex new file mode 160000 +Subproject 4dd645a62425c8a9a958a65f57c2aedca63c415 diff --git a/grextras b/grextras deleted file mode 160000 -Subproject 02e23f149fda731a5049f6df40a7a6eaff882f1 |