diff options
205 files changed, 74 insertions, 2422 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4bcd58ff48..cb912ee4ae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -302,27 +302,6 @@ GR_REGISTER_COMPONENT("testing-support" ENABLE_TESTING ) ######################################################################## -# Add optional dlls specified in DLL_PATHS -######################################################################## -foreach(path ${DLL_PATHS}) - file(GLOB _dlls "${path}/*.dll") - list(APPEND ALL_DLL_FILES ${_dlls}) -endforeach(path) -if(DEFINED ALL_DLL_FILES) - include(GrPackage) - CPACK_COMPONENT("extra_dlls" - DISPLAY_NAME "Extra DLLs" - DESCRIPTION "Extra DLLs for runtime dependency requirements" - ) - message(STATUS "") - message(STATUS "Including the following dlls into the install:") - foreach(_dll ${ALL_DLL_FILES}) - message(STATUS " ${_dll}") - endforeach(_dll) - install(FILES ${ALL_DLL_FILES} DESTINATION ${GR_RUNTIME_DIR} COMPONENT "extra_dlls") -endif() - -######################################################################## # Setup volk as a subproject ######################################################################## message(STATUS "") @@ -372,25 +351,6 @@ if(NOT VOLK_FOUND) set(VOLK_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_PREFIX}/lib) set(VOLK_INSTALL_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/include) - - if(ENABLE_VOLK) - - include(GrPackage) - CPACK_SET(CPACK_COMPONENT_GROUP_VOLK_DESCRIPTION "Vector optimized library of kernels") - - CPACK_COMPONENT("volk_runtime" - GROUP "Volk" - DISPLAY_NAME "Runtime" - DESCRIPTION "Dynamic link libraries" - ) - - CPACK_COMPONENT("volk_devel" - GROUP "Volk" - DISPLAY_NAME "Development" - DESCRIPTION "C++ headers, package config, import libraries" - ) - - endif(ENABLE_VOLK) else() message(STATUS " An external VOLK has been found and will be used for build.") set(ENABLE_VOLK TRUE) @@ -410,7 +370,6 @@ GR_LOGGING() install( FILES README README.hacking DESTINATION ${GR_PKG_DOC_DIR} - COMPONENT "docs" ) ######################################################################## @@ -501,12 +460,8 @@ list(REMOVE_ITEM cmake_others install( FILES ${cmake_configs} ${cmake_others} DESTINATION ${CMAKE_MODULES_DIR}/gnuradio - COMPONENT "runtime_devel" ) -#finalize cpack after subdirs processed -include(GrPackage) -CPACK_FINALIZE() ######################################################################## # Print summary @@ -533,5 +488,4 @@ install( FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-runtime/include/gnuradio/config.h DESTINATION ${GR_INCLUDE_DIR}/gnuradio - COMPONENT "runtime_devel" ) diff --git a/cmake/Modules/GrMiscUtils.cmake b/cmake/Modules/GrMiscUtils.cmake index 188c40480b..f005e35bab 100644 --- a/cmake/Modules/GrMiscUtils.cmake +++ b/cmake/Modules/GrMiscUtils.cmake @@ -108,7 +108,6 @@ endmacro(GR_ADD_CXX_COMPILER_FLAG_IF_AVAILABLE) # Generates the .la libtool file # This appears to generate libtool files that cannot be used by auto*. # Usage GR_LIBTOOL(TARGET [target] DESTINATION [dest]) -# Notice: there is not COMPONENT option, these will not get distributed. ######################################################################## function(GR_LIBTOOL) if(NOT DEFINED GENERATE_LIBTOOL) @@ -135,18 +134,14 @@ endfunction(GR_LIBTOOL) # Also handle gnuradio custom naming conventions w/ extras mode. ######################################################################## function(GR_LIBRARY_FOO target) - #parse the arguments for component names - include(CMakeParseArgumentsCopy) - CMAKE_PARSE_ARGUMENTS(GR_LIBRARY "" "RUNTIME_COMPONENT;DEVEL_COMPONENT" "" ${ARGN}) - #set additional target properties set_target_properties(${target} PROPERTIES SOVERSION ${LIBVER}) #install the generated files like so... install(TARGETS ${target} - LIBRARY DESTINATION ${GR_LIBRARY_DIR} COMPONENT ${GR_LIBRARY_RUNTIME_COMPONENT} # .so/.dylib file - ARCHIVE DESTINATION ${GR_LIBRARY_DIR} COMPONENT ${GR_LIBRARY_DEVEL_COMPONENT} # .lib file - RUNTIME DESTINATION ${GR_RUNTIME_DIR} COMPONENT ${GR_LIBRARY_RUNTIME_COMPONENT} # .dll file + LIBRARY DESTINATION ${GR_LIBRARY_DIR} # .so/.dylib file + ARCHIVE DESTINATION ${GR_LIBRARY_DIR} # .lib file + RUNTIME DESTINATION ${GR_RUNTIME_DIR} # .dll file ) #extras mode enabled automatically on linux @@ -178,7 +173,7 @@ function(GR_LIBRARY_FOO target) FILES ${CMAKE_CURRENT_BINARY_DIR}/lib${target}.so ${CMAKE_CURRENT_BINARY_DIR}/lib${target}-${LIBVER}.so.0 - DESTINATION ${GR_LIBRARY_DIR} COMPONENT ${GR_LIBRARY_RUNTIME_COMPONENT} + DESTINATION ${GR_LIBRARY_DIR} ) endif(LIBRARY_EXTRAS) diff --git a/cmake/Modules/GrPackage.cmake b/cmake/Modules/GrPackage.cmake deleted file mode 100644 index 54a752661d..0000000000 --- a/cmake/Modules/GrPackage.cmake +++ /dev/null @@ -1,182 +0,0 @@ -# Copyright 2011 Free Software Foundation, Inc. -# -# This file is part of GNU Radio -# -# GNU Radio is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3, or (at your option) -# any later version. -# -# GNU Radio is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Radio; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 51 Franklin Street, -# Boston, MA 02110-1301, USA. - -if(DEFINED __INCLUDED_GR_PACKAGE_CMAKE) - return() -endif() -set(__INCLUDED_GR_PACKAGE_CMAKE TRUE) - -include(GrVersion) #sets version information -include(GrPlatform) #sets platform information - -#set the cpack generator based on the platform type -if(CPACK_GENERATOR) - #already set by user -elseif(APPLE) - set(CPACK_GENERATOR PackageMaker) -elseif(WIN32) - set(CPACK_GENERATOR NSIS) -elseif(DEBIAN) - set(CPACK_GENERATOR DEB) -elseif(REDHAT) - set(CPACK_GENERATOR RPM) -else() - set(CPACK_GENERATOR TGZ) -endif() - -######################################################################## -# CPACK_SET - set a global variable and record the variable name -######################################################################## -function(CPACK_SET var) - set(${var} ${ARGN} CACHE INTERNAL "") - list(APPEND _cpack_vars ${var}) - list(REMOVE_DUPLICATES _cpack_vars) - set(_cpack_vars ${_cpack_vars} CACHE INTERNAL "") -endfunction(CPACK_SET) - -######################################################################## -# CPACK_FINALIZE - include cpack and the unset all the cpack variables -######################################################################## -function(CPACK_FINALIZE) - - #set the package depends for monolithic package - foreach(comp ${CPACK_COMPONENTS_ALL}) - string(TOUPPER "PACKAGE_DEPENDS_${comp}" package_depends_var) - list(APPEND PACKAGE_DEPENDS_ALL ${${package_depends_var}}) - endforeach(comp) - string(REPLACE ";" ", " CPACK_DEBIAN_PACKAGE_DEPENDS "${PACKAGE_DEPENDS_ALL}") - string(REPLACE ";" ", " CPACK_RPM_PACKAGE_REQUIRES "${PACKAGE_DEPENDS_ALL}") - - include(CPack) #finalize the cpack settings configured throughout the build system - foreach(var ${_cpack_vars}) - unset(${var} CACHE) - endforeach(var) - unset(_cpack_vars CACHE) -endfunction(CPACK_FINALIZE) - -######################################################################## -# CPACK_COMPONENT - convenience function to create a cpack component -# -# Usage: CPACK_COMPONENT( -# name -# [GROUP group] -# [DISPLAY_NAME display_name] -# [DESCRIPTION description] -# [DEPENDS depends] -# ) -######################################################################## -function(CPACK_COMPONENT name) - include(CMakeParseArgumentsCopy) - set(_options GROUP DISPLAY_NAME DESCRIPTION DEPENDS) - CMAKE_PARSE_ARGUMENTS(CPACK_COMPONENT "" "${_options}" "" ${ARGN}) - - string(TOUPPER "${name}" name_upper) - foreach(_option ${_options}) - if(CPACK_COMPONENT_${_option}) - CPACK_SET(CPACK_COMPONENT_${name_upper}_${_option} "${CPACK_COMPONENT_${_option}}") - endif() - endforeach(_option) - - CPACK_SET(CPACK_COMPONENTS_ALL "${CPACK_COMPONENTS_ALL};${name}") - -endfunction(CPACK_COMPONENT) - -######################################################################## -# Setup CPack -######################################################################## -set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "GNU Radio - The GNU Software Radio") -set(CPACK_PACKAGE_VENDOR "Free Software Foundation, Inc.") -set(CPACK_PACKAGE_CONTACT "Discuss GNURadio <discuss-gnuradio@gnu.org>") -string(REPLACE "v" "" CPACK_PACKAGE_VERSION ${VERSION}) -set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/README) -set(CPACK_RESOURCE_FILE_README ${CMAKE_SOURCE_DIR}/README) -set(CPACK_RESOURCE_FILE_WELCOME ${CMAKE_SOURCE_DIR}/README) - -find_program(LSB_RELEASE_EXECUTABLE lsb_release) - -if((DEBIAN OR REDHAT) AND LSB_RELEASE_EXECUTABLE) - - #extract system information by executing the commands - execute_process( - COMMAND ${LSB_RELEASE_EXECUTABLE} --short --id - OUTPUT_VARIABLE LSB_ID OUTPUT_STRIP_TRAILING_WHITESPACE - ) - execute_process( - COMMAND ${LSB_RELEASE_EXECUTABLE} --short --release - OUTPUT_VARIABLE LSB_RELEASE OUTPUT_STRIP_TRAILING_WHITESPACE - ) - - #set a more sensible package name for this system - SET(CPACK_PACKAGE_FILE_NAME "gnuradio_${CPACK_PACKAGE_VERSION}_${LSB_ID}-${LSB_RELEASE}-${CMAKE_SYSTEM_PROCESSOR}") - - #now try to include the component based dependencies - set(package_deps_file "${CMAKE_SOURCE_DIR}/cmake/Packaging/${LSB_ID}-${LSB_RELEASE}.cmake") - if (EXISTS ${package_deps_file}) - include(${package_deps_file}) - endif() - -endif() - -if(${CPACK_GENERATOR} STREQUAL NSIS) - - ENABLE_LANGUAGE(C) - - include(CheckTypeSize) - check_type_size("void*[8]" BIT_WIDTH BUILTIN_TYPES_ONLY) - SET(CPACK_PACKAGE_FILE_NAME "gnuradio_${CPACK_PACKAGE_VERSION}_Win${BIT_WIDTH}") - - set(CPACK_PACKAGE_INSTALL_DIRECTORY "${CMAKE_PROJECT_NAME}") -endif() - -######################################################################## -# DEB package specific -######################################################################## -foreach(filename preinst postinst prerm postrm) - list(APPEND CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA ${CMAKE_BINARY_DIR}/Packaging/${filename}) - file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Packaging) - configure_file( - ${CMAKE_SOURCE_DIR}/cmake/Packaging/${filename}.in - ${CMAKE_BINARY_DIR}/Packaging/${filename} - @ONLY) -endforeach(filename) - -######################################################################## -# RPM package specific -######################################################################## -foreach(filename post_install post_uninstall pre_install pre_uninstall) - string(TOUPPER ${filename} filename_upper) - list(APPEND CPACK_RPM_${filename_upper}_SCRIPT_FILE ${CMAKE_BINARY_DIR}/Packaging/${filename}) - file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Packaging) - configure_file( - ${CMAKE_SOURCE_DIR}/cmake/Packaging/${filename}.in - ${CMAKE_BINARY_DIR}/Packaging/${filename} - @ONLY) -endforeach(filename) - -######################################################################## -# NSIS package specific -######################################################################## -set(CPACK_NSIS_MODIFY_PATH ON) - -set(HLKM_ENV "\\\"SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment\\\"") - -IF(WIN32) - #Install necessary runtime DLL's - INCLUDE(InstallRequiredSystemLibraries) -ENDIF(WIN32) diff --git a/cmake/Modules/GrPython.cmake b/cmake/Modules/GrPython.cmake index 06e061e212..0bfa92db8d 100644 --- a/cmake/Modules/GrPython.cmake +++ b/cmake/Modules/GrPython.cmake @@ -130,7 +130,7 @@ endfunction(GR_UNIQUE_TARGET) ######################################################################## function(GR_PYTHON_INSTALL) include(CMakeParseArgumentsCopy) - CMAKE_PARSE_ARGUMENTS(GR_PYTHON_INSTALL "" "DESTINATION;COMPONENT" "FILES;PROGRAMS" ${ARGN}) + CMAKE_PARSE_ARGUMENTS(GR_PYTHON_INSTALL "" "DESTINATION" "FILES;PROGRAMS" ${ARGN}) #################################################################### if(GR_PYTHON_INSTALL_FILES) @@ -182,7 +182,6 @@ function(GR_PYTHON_INSTALL) set(python_install_gen_targets ${pycfiles} ${pyofiles}) install(FILES ${python_install_gen_targets} DESTINATION ${GR_PYTHON_INSTALL_DESTINATION} - COMPONENT ${GR_PYTHON_INSTALL_COMPONENT} ) #################################################################### @@ -219,7 +218,6 @@ function(GR_PYTHON_INSTALL) install(PROGRAMS ${pyexefile} RENAME ${pyfile_name} DESTINATION ${GR_PYTHON_INSTALL_DESTINATION} - COMPONENT ${GR_PYTHON_INSTALL_COMPONENT} ) endforeach(pyfile) diff --git a/cmake/Modules/GrSwig.cmake b/cmake/Modules/GrSwig.cmake index ef3a76eb4c..400cde295d 100644 --- a/cmake/Modules/GrSwig.cmake +++ b/cmake/Modules/GrSwig.cmake @@ -202,24 +202,21 @@ endmacro(GR_SWIG_MAKE) # GR_SWIG_INSTALL( # TARGETS target target target... # [DESTINATION destination] -# [COMPONENT component] # ) ######################################################################## macro(GR_SWIG_INSTALL) include(CMakeParseArgumentsCopy) - CMAKE_PARSE_ARGUMENTS(GR_SWIG_INSTALL "" "DESTINATION;COMPONENT" "TARGETS" ${ARGN}) + CMAKE_PARSE_ARGUMENTS(GR_SWIG_INSTALL "" "DESTINATION" "TARGETS" ${ARGN}) foreach(name ${GR_SWIG_INSTALL_TARGETS}) install(TARGETS ${SWIG_MODULE_${name}_REAL_NAME} DESTINATION ${GR_SWIG_INSTALL_DESTINATION} - COMPONENT ${GR_SWIG_INSTALL_COMPONENT} ) include(GrPython) GR_PYTHON_INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${name}.py DESTINATION ${GR_SWIG_INSTALL_DESTINATION} - COMPONENT ${GR_SWIG_INSTALL_COMPONENT} ) GR_LIBTOOL( diff --git a/cmake/Modules/NSIS.InstallOptions.ini.in b/cmake/Modules/NSIS.InstallOptions.ini.in deleted file mode 100644 index 46b6c1605b..0000000000 --- a/cmake/Modules/NSIS.InstallOptions.ini.in +++ /dev/null @@ -1,37 +0,0 @@ -[Settings] -NumFields=4 - -[Field 1] -Type=label -Text=By default GNU Radio does not add its directory to the system PATH. -Left=0 -Right=-1 -Top=0 -Bottom=20 - -[Field 2] -Type=radiobutton -Text=Do not add GNU Radio to the system PATH -Left=0 -Right=-1 -Top=30 -Bottom=40 -State=1 - -[Field 3] -Type=radiobutton -Text=Add GNU Radio to the system PATH for all users -Left=0 -Right=-1 -Top=40 -Bottom=50 -State=0 - -[Field 4] -Type=radiobutton -Text=Add GNU Radio to the system PATH for current user -Left=0 -Right=-1 -Top=50 -Bottom=60 -State=0 diff --git a/cmake/Modules/NSIS.template.in b/cmake/Modules/NSIS.template.in deleted file mode 100644 index 910fafdedd..0000000000 --- a/cmake/Modules/NSIS.template.in +++ /dev/null @@ -1,951 +0,0 @@ -; CPack install script designed for a nmake build - -;-------------------------------- -; You must define these values - - !define VERSION "@CPACK_PACKAGE_VERSION@" - !define PATCH "@CPACK_PACKAGE_VERSION_PATCH@" - !define INST_DIR "@CPACK_TEMPORARY_DIRECTORY@" - -;-------------------------------- -;Variables - - Var MUI_TEMP - Var STARTMENU_FOLDER - Var SV_ALLUSERS - Var START_MENU - Var DO_NOT_ADD_TO_PATH - Var ADD_TO_PATH_ALL_USERS - Var ADD_TO_PATH_CURRENT_USER - Var INSTALL_DESKTOP - Var IS_DEFAULT_INSTALLDIR -;-------------------------------- -;Include Modern UI - - !include "MUI.nsh" - - ;Default installation folder - InstallDir "@CPACK_NSIS_INSTALL_ROOT@\@CPACK_PACKAGE_INSTALL_DIRECTORY@" - -;-------------------------------- -;General - - ;Name and file - Name "GNU Radio" - OutFile "@CPACK_TOPLEVEL_DIRECTORY@/@CPACK_OUTPUT_FILE_NAME@" - - ;Set compression - SetCompressor @CPACK_NSIS_COMPRESSOR@ - -@CPACK_NSIS_DEFINES@ - - !include Sections.nsh - -;--- Component support macros: --- -; The code for the add/remove functionality is from: -; http://nsis.sourceforge.net/Add/Remove_Functionality -; It has been modified slightly and extended to provide -; inter-component dependencies. -Var AR_SecFlags -Var AR_RegFlags -@CPACK_NSIS_SECTION_SELECTED_VARS@ - -; Loads the "selected" flag for the section named SecName into the -; variable VarName. -!macro LoadSectionSelectedIntoVar SecName VarName - SectionGetFlags ${${SecName}} $${VarName} - IntOp $${VarName} $${VarName} & ${SF_SELECTED} ;Turn off all other bits -!macroend - -; Loads the value of a variable... can we get around this? -!macro LoadVar VarName - IntOp $R0 0 + $${VarName} -!macroend - -; Sets the value of a variable -!macro StoreVar VarName IntValue - IntOp $${VarName} 0 + ${IntValue} -!macroend - -!macro InitSection SecName - ; This macro reads component installed flag from the registry and - ;changes checked state of the section on the components page. - ;Input: section index constant name specified in Section command. - - ClearErrors - ;Reading component status from registry - ReadRegDWORD $AR_RegFlags HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@\Components\${SecName}" "Installed" - IfErrors "default_${SecName}" - ;Status will stay default if registry value not found - ;(component was never installed) - IntOp $AR_RegFlags $AR_RegFlags & ${SF_SELECTED} ;Turn off all other bits - SectionGetFlags ${${SecName}} $AR_SecFlags ;Reading default section flags - IntOp $AR_SecFlags $AR_SecFlags & 0xFFFE ;Turn lowest (enabled) bit off - IntOp $AR_SecFlags $AR_RegFlags | $AR_SecFlags ;Change lowest bit - - ; Note whether this component was installed before - !insertmacro StoreVar ${SecName}_was_installed $AR_RegFlags - IntOp $R0 $AR_RegFlags & $AR_RegFlags - - ;Writing modified flags - SectionSetFlags ${${SecName}} $AR_SecFlags - - "default_${SecName}:" - !insertmacro LoadSectionSelectedIntoVar ${SecName} ${SecName}_selected -!macroend - -!macro FinishSection SecName - ; This macro reads section flag set by user and removes the section - ;if it is not selected. - ;Then it writes component installed flag to registry - ;Input: section index constant name specified in Section command. - - SectionGetFlags ${${SecName}} $AR_SecFlags ;Reading section flags - ;Checking lowest bit: - IntOp $AR_SecFlags $AR_SecFlags & ${SF_SELECTED} - IntCmp $AR_SecFlags 1 "leave_${SecName}" - ;Section is not selected: - ;Calling Section uninstall macro and writing zero installed flag - !insertmacro "Remove_${${SecName}}" - WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@\Components\${SecName}" \ - "Installed" 0 - Goto "exit_${SecName}" - - "leave_${SecName}:" - ;Section is selected: - WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@\Components\${SecName}" \ - "Installed" 1 - - "exit_${SecName}:" -!macroend - -!macro RemoveSection SecName - ; This macro is used to call section's Remove_... macro - ;from the uninstaller. - ;Input: section index constant name specified in Section command. - - !insertmacro "Remove_${${SecName}}" -!macroend - -; Determine whether the selection of SecName changed -!macro MaybeSelectionChanged SecName - !insertmacro LoadVar ${SecName}_selected - SectionGetFlags ${${SecName}} $R1 - IntOp $R1 $R1 & ${SF_SELECTED} ;Turn off all other bits - - ; See if the status has changed: - IntCmp $R0 $R1 "${SecName}_unchanged" - !insertmacro LoadSectionSelectedIntoVar ${SecName} ${SecName}_selected - - IntCmp $R1 ${SF_SELECTED} "${SecName}_was_selected" - !insertmacro "Deselect_required_by_${SecName}" - goto "${SecName}_unchanged" - - "${SecName}_was_selected:" - !insertmacro "Select_${SecName}_depends" - - "${SecName}_unchanged:" -!macroend -;--- End of Add/Remove macros --- - -;-------------------------------- -;Interface Settings - - !define MUI_HEADERIMAGE - !define MUI_ABORTWARNING - -;-------------------------------- -; path functions - -!verbose 3 -!include "WinMessages.NSH" -!verbose 4 - -;---------------------------------------- -; based upon a script of "Written by KiCHiK 2003-01-18 05:57:02" -;---------------------------------------- -!verbose 3 -!include "WinMessages.NSH" -!verbose 4 -;==================================================== -; get_NT_environment -; Returns: the selected environment -; Output : head of the stack -;==================================================== -!macro select_NT_profile UN -Function ${UN}select_NT_profile - StrCmp $ADD_TO_PATH_ALL_USERS "1" 0 environment_single - DetailPrint "Selected environment for all users" - Push "all" - Return - environment_single: - DetailPrint "Selected environment for current user only." - Push "current" - Return -FunctionEnd -!macroend -!insertmacro select_NT_profile "" -!insertmacro select_NT_profile "un." -;---------------------------------------------------- -!define NT_current_env 'HKCU "Environment"' -!define NT_all_env 'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"' - -!ifndef WriteEnvStr_RegKey - !ifdef ALL_USERS - !define WriteEnvStr_RegKey \ - 'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"' - !else - !define WriteEnvStr_RegKey 'HKCU "Environment"' - !endif -!endif - -; AddToPath - Adds the given dir to the search path. -; Input - head of the stack -; Note - Win9x systems requires reboot - -Function AddToPath - Exch $0 - Push $1 - Push $2 - Push $3 - - # don't add if the path doesn't exist - IfFileExists "$0\*.*" "" AddToPath_done - - ReadEnvStr $1 PATH - ; if the path is too long for a NSIS variable NSIS will return a 0 - ; length string. If we find that, then warn and skip any path - ; modification as it will trash the existing path. - StrLen $2 $1 - IntCmp $2 0 CheckPathLength_ShowPathWarning CheckPathLength_Done CheckPathLength_Done - CheckPathLength_ShowPathWarning: - Messagebox MB_OK|MB_ICONEXCLAMATION "Warning! PATH too long installer unable to modify PATH!" - Goto AddToPath_done - CheckPathLength_Done: - Push "$1;" - Push "$0;" - Call StrStr - Pop $2 - StrCmp $2 "" "" AddToPath_done - Push "$1;" - Push "$0\;" - Call StrStr - Pop $2 - StrCmp $2 "" "" AddToPath_done - GetFullPathName /SHORT $3 $0 - Push "$1;" - Push "$3;" - Call StrStr - Pop $2 - StrCmp $2 "" "" AddToPath_done - Push "$1;" - Push "$3\;" - Call StrStr - Pop $2 - StrCmp $2 "" "" AddToPath_done - - Call IsNT - Pop $1 - StrCmp $1 1 AddToPath_NT - ; Not on NT - StrCpy $1 $WINDIR 2 - FileOpen $1 "$1\autoexec.bat" a - FileSeek $1 -1 END - FileReadByte $1 $2 - IntCmp $2 26 0 +2 +2 # DOS EOF - FileSeek $1 -1 END # write over EOF - FileWrite $1 "$\r$\nSET PATH=%PATH%;$3$\r$\n" - FileClose $1 - SetRebootFlag true - Goto AddToPath_done - - AddToPath_NT: - StrCmp $ADD_TO_PATH_ALL_USERS "1" ReadAllKey - ReadRegStr $1 ${NT_current_env} "PATH" - Goto DoTrim - ReadAllKey: - ReadRegStr $1 ${NT_all_env} "PATH" - DoTrim: - StrCmp $1 "" AddToPath_NTdoIt - Push $1 - Call Trim - Pop $1 - StrCpy $0 "$1;$0" - AddToPath_NTdoIt: - StrCmp $ADD_TO_PATH_ALL_USERS "1" WriteAllKey - WriteRegExpandStr ${NT_current_env} "PATH" $0 - Goto DoSend - WriteAllKey: - WriteRegExpandStr ${NT_all_env} "PATH" $0 - DoSend: - SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000 - - AddToPath_done: - Pop $3 - Pop $2 - Pop $1 - Pop $0 -FunctionEnd - - -; RemoveFromPath - Remove a given dir from the path -; Input: head of the stack - -Function un.RemoveFromPath - Exch $0 - Push $1 - Push $2 - Push $3 - Push $4 - Push $5 - Push $6 - - IntFmt $6 "%c" 26 # DOS EOF - - Call un.IsNT - Pop $1 - StrCmp $1 1 unRemoveFromPath_NT - ; Not on NT - StrCpy $1 $WINDIR 2 - FileOpen $1 "$1\autoexec.bat" r - GetTempFileName $4 - FileOpen $2 $4 w - GetFullPathName /SHORT $0 $0 - StrCpy $0 "SET PATH=%PATH%;$0" - Goto unRemoveFromPath_dosLoop - - unRemoveFromPath_dosLoop: - FileRead $1 $3 - StrCpy $5 $3 1 -1 # read last char - StrCmp $5 $6 0 +2 # if DOS EOF - StrCpy $3 $3 -1 # remove DOS EOF so we can compare - StrCmp $3 "$0$\r$\n" unRemoveFromPath_dosLoopRemoveLine - StrCmp $3 "$0$\n" unRemoveFromPath_dosLoopRemoveLine - StrCmp $3 "$0" unRemoveFromPath_dosLoopRemoveLine - StrCmp $3 "" unRemoveFromPath_dosLoopEnd - FileWrite $2 $3 - Goto unRemoveFromPath_dosLoop - unRemoveFromPath_dosLoopRemoveLine: - SetRebootFlag true - Goto unRemoveFromPath_dosLoop - - unRemoveFromPath_dosLoopEnd: - FileClose $2 - FileClose $1 - StrCpy $1 $WINDIR 2 - Delete "$1\autoexec.bat" - CopyFiles /SILENT $4 "$1\autoexec.bat" - Delete $4 - Goto unRemoveFromPath_done - - unRemoveFromPath_NT: - StrCmp $ADD_TO_PATH_ALL_USERS "1" unReadAllKey - ReadRegStr $1 ${NT_current_env} "PATH" - Goto unDoTrim - unReadAllKey: - ReadRegStr $1 ${NT_all_env} "PATH" - unDoTrim: - StrCpy $5 $1 1 -1 # copy last char - StrCmp $5 ";" +2 # if last char != ; - StrCpy $1 "$1;" # append ; - Push $1 - Push "$0;" - Call un.StrStr ; Find `$0;` in $1 - Pop $2 ; pos of our dir - StrCmp $2 "" unRemoveFromPath_done - ; else, it is in path - # $0 - path to add - # $1 - path var - StrLen $3 "$0;" - StrLen $4 $2 - StrCpy $5 $1 -$4 # $5 is now the part before the path to remove - StrCpy $6 $2 "" $3 # $6 is now the part after the path to remove - StrCpy $3 $5$6 - - StrCpy $5 $3 1 -1 # copy last char - StrCmp $5 ";" 0 +2 # if last char == ; - StrCpy $3 $3 -1 # remove last char - - StrCmp $ADD_TO_PATH_ALL_USERS "1" unWriteAllKey - WriteRegExpandStr ${NT_current_env} "PATH" $3 - Goto unDoSend - unWriteAllKey: - WriteRegExpandStr ${NT_all_env} "PATH" $3 - unDoSend: - SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000 - - unRemoveFromPath_done: - Pop $6 - Pop $5 - Pop $4 - Pop $3 - Pop $2 - Pop $1 - Pop $0 -FunctionEnd - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -; Uninstall sutff -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -########################################### -# Utility Functions # -########################################### - -;==================================================== -; IsNT - Returns 1 if the current system is NT, 0 -; otherwise. -; Output: head of the stack -;==================================================== -; IsNT -; no input -; output, top of the stack = 1 if NT or 0 if not -; -; Usage: -; Call IsNT -; Pop $R0 -; ($R0 at this point is 1 or 0) - -!macro IsNT un -Function ${un}IsNT - Push $0 - ReadRegStr $0 HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion - StrCmp $0 "" 0 IsNT_yes - ; we are not NT. - Pop $0 - Push 0 - Return - - IsNT_yes: - ; NT!!! - Pop $0 - Push 1 -FunctionEnd -!macroend -!insertmacro IsNT "" -!insertmacro IsNT "un." - -; StrStr -; input, top of stack = string to search for -; top of stack-1 = string to search in -; output, top of stack (replaces with the portion of the string remaining) -; modifies no other variables. -; -; Usage: -; Push "this is a long ass string" -; Push "ass" -; Call StrStr -; Pop $R0 -; ($R0 at this point is "ass string") - -!macro StrStr un -Function ${un}StrStr -Exch $R1 ; st=haystack,old$R1, $R1=needle - Exch ; st=old$R1,haystack - Exch $R2 ; st=old$R1,old$R2, $R2=haystack - Push $R3 - Push $R4 - Push $R5 - StrLen $R3 $R1 - StrCpy $R4 0 - ; $R1=needle - ; $R2=haystack - ; $R3=len(needle) - ; $R4=cnt - ; $R5=tmp - loop: - StrCpy $R5 $R2 $R3 $R4 - StrCmp $R5 $R1 done - StrCmp $R5 "" done - IntOp $R4 $R4 + 1 - Goto loop -done: - StrCpy $R1 $R2 "" $R4 - Pop $R5 - Pop $R4 - Pop $R3 - Pop $R2 - Exch $R1 -FunctionEnd -!macroend -!insertmacro StrStr "" -!insertmacro StrStr "un." - -Function Trim ; Added by Pelaca - Exch $R1 - Push $R2 -Loop: - StrCpy $R2 "$R1" 1 -1 - StrCmp "$R2" " " RTrim - StrCmp "$R2" "$\n" RTrim - StrCmp "$R2" "$\r" RTrim - StrCmp "$R2" ";" RTrim - GoTo Done -RTrim: - StrCpy $R1 "$R1" -1 - Goto Loop -Done: - Pop $R2 - Exch $R1 -FunctionEnd - -Function ConditionalAddToRegisty - Pop $0 - Pop $1 - StrCmp "$0" "" ConditionalAddToRegisty_EmptyString - WriteRegStr SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@" \ - "$1" "$0" - ;MessageBox MB_OK "Set Registry: '$1' to '$0'" - DetailPrint "Set install registry entry: '$1' to '$0'" - ConditionalAddToRegisty_EmptyString: -FunctionEnd - -;-------------------------------- - -!ifdef CPACK_USES_DOWNLOAD -Function DownloadFile - IfFileExists $INSTDIR\* +2 - CreateDirectory $INSTDIR - Pop $0 - - ; Skip if already downloaded - IfFileExists $INSTDIR\$0 0 +2 - Return - - StrCpy $1 "@CPACK_DOWNLOAD_SITE@" - - try_again: - NSISdl::download "$1/$0" "$INSTDIR\$0" - - Pop $1 - StrCmp $1 "success" success - StrCmp $1 "Cancelled" cancel - MessageBox MB_OK "Download failed: $1" - cancel: - Return - success: -FunctionEnd -!endif - -;-------------------------------- -; Installation types -@CPACK_NSIS_INSTALLATION_TYPES@ - -;-------------------------------- -; Component sections -@CPACK_NSIS_COMPONENT_SECTIONS@ - -;-------------------------------- -; Define some macro setting for the gui -@CPACK_NSIS_INSTALLER_MUI_ICON_CODE@ -@CPACK_NSIS_INSTALLER_ICON_CODE@ -@CPACK_NSIS_INSTALLER_MUI_COMPONENTS_DESC@ -@CPACK_NSIS_INSTALLER_MUI_FINISHPAGE_RUN_CODE@ - -;-------------------------------- -;Pages - !insertmacro MUI_PAGE_WELCOME - - !insertmacro MUI_PAGE_LICENSE "@CPACK_RESOURCE_FILE_LICENSE@" - Page custom InstallOptionsPage - !insertmacro MUI_PAGE_DIRECTORY - - ;Start Menu Folder Page Configuration - !define MUI_STARTMENUPAGE_REGISTRY_ROOT "SHCTX" - !define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\@CPACK_PACKAGE_VENDOR@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@" - !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder" - !insertmacro MUI_PAGE_STARTMENU Application $STARTMENU_FOLDER - - @CPACK_NSIS_PAGE_COMPONENTS@ - - !insertmacro MUI_PAGE_INSTFILES - !insertmacro MUI_PAGE_FINISH - - !insertmacro MUI_UNPAGE_CONFIRM - !insertmacro MUI_UNPAGE_INSTFILES - -;-------------------------------- -;Languages - - !insertmacro MUI_LANGUAGE "English" ;first language is the default language - !insertmacro MUI_LANGUAGE "Albanian" - !insertmacro MUI_LANGUAGE "Arabic" - !insertmacro MUI_LANGUAGE "Basque" - !insertmacro MUI_LANGUAGE "Belarusian" - !insertmacro MUI_LANGUAGE "Bosnian" - !insertmacro MUI_LANGUAGE "Breton" - !insertmacro MUI_LANGUAGE "Bulgarian" - !insertmacro MUI_LANGUAGE "Croatian" - !insertmacro MUI_LANGUAGE "Czech" - !insertmacro MUI_LANGUAGE "Danish" - !insertmacro MUI_LANGUAGE "Dutch" - !insertmacro MUI_LANGUAGE "Estonian" - !insertmacro MUI_LANGUAGE "Farsi" - !insertmacro MUI_LANGUAGE "Finnish" - !insertmacro MUI_LANGUAGE "French" - !insertmacro MUI_LANGUAGE "German" - !insertmacro MUI_LANGUAGE "Greek" - !insertmacro MUI_LANGUAGE "Hebrew" - !insertmacro MUI_LANGUAGE "Hungarian" - !insertmacro MUI_LANGUAGE "Icelandic" - !insertmacro MUI_LANGUAGE "Indonesian" - !insertmacro MUI_LANGUAGE "Irish" - !insertmacro MUI_LANGUAGE "Italian" - !insertmacro MUI_LANGUAGE "Japanese" - !insertmacro MUI_LANGUAGE "Korean" - !insertmacro MUI_LANGUAGE "Kurdish" - !insertmacro MUI_LANGUAGE "Latvian" - !insertmacro MUI_LANGUAGE "Lithuanian" - !insertmacro MUI_LANGUAGE "Luxembourgish" - !insertmacro MUI_LANGUAGE "Macedonian" - !insertmacro MUI_LANGUAGE "Malay" - !insertmacro MUI_LANGUAGE "Mongolian" - !insertmacro MUI_LANGUAGE "Norwegian" - !insertmacro MUI_LANGUAGE "Polish" - !insertmacro MUI_LANGUAGE "Portuguese" - !insertmacro MUI_LANGUAGE "PortugueseBR" - !insertmacro MUI_LANGUAGE "Romanian" - !insertmacro MUI_LANGUAGE "Russian" - !insertmacro MUI_LANGUAGE "Serbian" - !insertmacro MUI_LANGUAGE "SerbianLatin" - !insertmacro MUI_LANGUAGE "SimpChinese" - !insertmacro MUI_LANGUAGE "Slovak" - !insertmacro MUI_LANGUAGE "Slovenian" - !insertmacro MUI_LANGUAGE "Spanish" - !insertmacro MUI_LANGUAGE "Swedish" - !insertmacro MUI_LANGUAGE "Thai" - !insertmacro MUI_LANGUAGE "TradChinese" - !insertmacro MUI_LANGUAGE "Turkish" - !insertmacro MUI_LANGUAGE "Ukrainian" - !insertmacro MUI_LANGUAGE "Welsh" - - -;-------------------------------- -;Reserve Files - - ;These files should be inserted before other files in the data block - ;Keep these lines before any File command - ;Only for solid compression (by default, solid compression is enabled for BZIP2 and LZMA) - - ReserveFile "NSIS.InstallOptions.ini" - !insertmacro MUI_RESERVEFILE_INSTALLOPTIONS - -;-------------------------------- -;Installer Sections - -Section "-Core installation" - ;Use the entire tree produced by the INSTALL target. Keep the - ;list of directories here in sync with the RMDir commands below. - SetOutPath "$INSTDIR" - @CPACK_NSIS_FULL_INSTALL@ - - ;Store installation folder - WriteRegStr SHCTX "Software\@CPACK_PACKAGE_VENDOR@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@" "" $INSTDIR - - ;Create uninstaller - WriteUninstaller "$INSTDIR\Uninstall.exe" - Push "DisplayName" - Push "@CPACK_NSIS_DISPLAY_NAME@" - Call ConditionalAddToRegisty - Push "DisplayVersion" - Push "@CPACK_PACKAGE_VERSION@" - Call ConditionalAddToRegisty - Push "Publisher" - Push "@CPACK_PACKAGE_VENDOR@" - Call ConditionalAddToRegisty - Push "UninstallString" - Push "$INSTDIR\Uninstall.exe" - Call ConditionalAddToRegisty - Push "NoRepair" - Push "1" - Call ConditionalAddToRegisty - - !ifdef CPACK_NSIS_ADD_REMOVE - ;Create add/remove functionality - Push "ModifyPath" - Push "$INSTDIR\AddRemove.exe" - Call ConditionalAddToRegisty - !else - Push "NoModify" - Push "1" - Call ConditionalAddToRegisty - !endif - - ; Optional registration - Push "DisplayIcon" - Push "$INSTDIR\@CPACK_NSIS_INSTALLED_ICON_NAME@" - Call ConditionalAddToRegisty - Push "HelpLink" - Push "@CPACK_NSIS_HELP_LINK@" - Call ConditionalAddToRegisty - Push "URLInfoAbout" - Push "@CPACK_NSIS_URL_INFO_ABOUT@" - Call ConditionalAddToRegisty - Push "Contact" - Push "@CPACK_NSIS_CONTACT@" - Call ConditionalAddToRegisty - !insertmacro MUI_INSTALLOPTIONS_READ $INSTALL_DESKTOP "NSIS.InstallOptions.ini" "Field 5" "State" - !insertmacro MUI_STARTMENU_WRITE_BEGIN Application - - ;Create shortcuts - CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER" -@CPACK_NSIS_CREATE_ICONS@ -@CPACK_NSIS_CREATE_ICONS_EXTRA@ - CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk" "$INSTDIR\Uninstall.exe" - CreateShortcut "$SMPROGRAMS\$STARTMENU_FOLDER\GNU Radio Companion.lnk" "$INSTDIR\bin\gnuradio-companion.py" "" "" "" SW_SHOWMINIMIZED - - ;Read a value from an InstallOptions INI file - !insertmacro MUI_INSTALLOPTIONS_READ $DO_NOT_ADD_TO_PATH "NSIS.InstallOptions.ini" "Field 2" "State" - !insertmacro MUI_INSTALLOPTIONS_READ $ADD_TO_PATH_ALL_USERS "NSIS.InstallOptions.ini" "Field 3" "State" - !insertmacro MUI_INSTALLOPTIONS_READ $ADD_TO_PATH_CURRENT_USER "NSIS.InstallOptions.ini" "Field 4" "State" - - ; Write special uninstall registry entries - Push "StartMenu" - Push "$STARTMENU_FOLDER" - Call ConditionalAddToRegisty - Push "DoNotAddToPath" - Push "$DO_NOT_ADD_TO_PATH" - Call ConditionalAddToRegisty - Push "AddToPathAllUsers" - Push "$ADD_TO_PATH_ALL_USERS" - Call ConditionalAddToRegisty - Push "AddToPathCurrentUser" - Push "$ADD_TO_PATH_CURRENT_USER" - Call ConditionalAddToRegisty - Push "InstallToDesktop" - Push "$INSTALL_DESKTOP" - Call ConditionalAddToRegisty - - !insertmacro MUI_STARTMENU_WRITE_END - -@CPACK_NSIS_EXTRA_INSTALL_COMMANDS@ - -SectionEnd - -Section "-Add to path" - Push $INSTDIR\bin - StrCmp "@CPACK_NSIS_MODIFY_PATH@" "ON" 0 doNotAddToPath - StrCmp $DO_NOT_ADD_TO_PATH "1" doNotAddToPath 0 - Call AddToPath - doNotAddToPath: -SectionEnd - -;-------------------------------- -; Create custom pages -Function InstallOptionsPage - !insertmacro MUI_HEADER_TEXT "Install Options" "Choose options for installing GNU Radio" - !insertmacro MUI_INSTALLOPTIONS_DISPLAY "NSIS.InstallOptions.ini" - -FunctionEnd - -;-------------------------------- -; determine admin versus local install -Function un.onInit - - ClearErrors - UserInfo::GetName - IfErrors noLM - Pop $0 - UserInfo::GetAccountType - Pop $1 - StrCmp $1 "Admin" 0 +3 - SetShellVarContext all - ;MessageBox MB_OK 'User "$0" is in the Admin group' - Goto done - StrCmp $1 "Power" 0 +3 - SetShellVarContext all - ;MessageBox MB_OK 'User "$0" is in the Power Users group' - Goto done - - noLM: - ;Get installation folder from registry if available - - done: - -FunctionEnd - -;--- Add/Remove callback functions: --- -!macro SectionList MacroName - ;This macro used to perform operation on multiple sections. - ;List all of your components in following manner here. -@CPACK_NSIS_COMPONENT_SECTION_LIST@ -!macroend - -Section -FinishComponents - ;Removes unselected components and writes component status to registry - !insertmacro SectionList "FinishSection" - -!ifdef CPACK_NSIS_ADD_REMOVE - ; Get the name of the installer executable - System::Call 'kernel32::GetModuleFileNameA(i 0, t .R0, i 1024) i r1' - StrCpy $R3 $R0 - - ; Strip off the last 13 characters, to see if we have AddRemove.exe - StrLen $R1 $R0 - IntOp $R1 $R0 - 13 - StrCpy $R2 $R0 13 $R1 - StrCmp $R2 "AddRemove.exe" addremove_installed - - ; We're not running AddRemove.exe, so install it - CopyFiles $R3 $INSTDIR\AddRemove.exe - - addremove_installed: -!endif -SectionEnd -;--- End of Add/Remove callback functions --- - -;-------------------------------- -; Component dependencies -Function .onSelChange - !insertmacro SectionList MaybeSelectionChanged -FunctionEnd - -;-------------------------------- -;Uninstaller Section - -Section "Uninstall" - ReadRegStr $START_MENU SHCTX \ - "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@" "StartMenu" - ;MessageBox MB_OK "Start menu is in: $START_MENU" - ReadRegStr $DO_NOT_ADD_TO_PATH SHCTX \ - "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@" "DoNotAddToPath" - ReadRegStr $ADD_TO_PATH_ALL_USERS SHCTX \ - "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@" "AddToPathAllUsers" - ReadRegStr $ADD_TO_PATH_CURRENT_USER SHCTX \ - "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@" "AddToPathCurrentUser" - ;MessageBox MB_OK "Add to path: $DO_NOT_ADD_TO_PATH all users: $ADD_TO_PATH_ALL_USERS" - ReadRegStr $INSTALL_DESKTOP SHCTX \ - "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@" "InstallToDesktop" - ;MessageBox MB_OK "Install to desktop: $INSTALL_DESKTOP " - -@CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS@ - - ;Remove files we installed. - ;Keep the list of directories here in sync with the File commands above. -@CPACK_NSIS_DELETE_FILES@ -@CPACK_NSIS_DELETE_DIRECTORIES@ - -!ifdef CPACK_NSIS_ADD_REMOVE - ;Remove the add/remove program - Delete "$INSTDIR\AddRemove.exe" -!endif - - ;Remove the uninstaller itself. - Delete "$INSTDIR\Uninstall.exe" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@" - - ;Remove the installation directory if it is empty. - RMDir "$INSTDIR" - - ; Remove the registry entries. - DeleteRegKey SHCTX "Software\@CPACK_PACKAGE_VENDOR@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@" - - ; Removes all optional components - !insertmacro SectionList "RemoveSection" - - !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP - - Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk" -@CPACK_NSIS_DELETE_ICONS@ -@CPACK_NSIS_DELETE_ICONS_EXTRA@ - - ;Delete empty start menu parent diretories - StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP" - - startMenuDeleteLoop: - ClearErrors - RMDir $MUI_TEMP - GetFullPathName $MUI_TEMP "$MUI_TEMP\.." - - IfErrors startMenuDeleteLoopDone - - StrCmp "$MUI_TEMP" "$SMPROGRAMS" startMenuDeleteLoopDone startMenuDeleteLoop - startMenuDeleteLoopDone: - - ; If the user changed the shortcut, then untinstall may not work. This should - ; try to fix it. - StrCpy $MUI_TEMP "$START_MENU" - Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk" - Delete "$SMPROGRAMS\$MUI_TEMP\GNU Radio Companion.lnk" -@CPACK_NSIS_DELETE_ICONS_EXTRA@ - - ;Delete empty start menu parent diretories - StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP" - - secondStartMenuDeleteLoop: - ClearErrors - RMDir $MUI_TEMP - GetFullPathName $MUI_TEMP "$MUI_TEMP\.." - - IfErrors secondStartMenuDeleteLoopDone - - StrCmp "$MUI_TEMP" "$SMPROGRAMS" secondStartMenuDeleteLoopDone secondStartMenuDeleteLoop - secondStartMenuDeleteLoopDone: - - DeleteRegKey /ifempty SHCTX "Software\@CPACK_PACKAGE_VENDOR@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@" - - Push $INSTDIR\bin - StrCmp $DO_NOT_ADD_TO_PATH_ "1" doNotRemoveFromPath 0 - Call un.RemoveFromPath - doNotRemoveFromPath: -SectionEnd - -;-------------------------------- -; determine admin versus local install -; Is install for "AllUsers" or "JustMe"? -; Default to "JustMe" - set to "AllUsers" if admin or on Win9x -; This function is used for the very first "custom page" of the installer. -; This custom page does not show up visibly, but it executes prior to the -; first visible page and sets up $INSTDIR properly... -; Choose different default installation folder based on SV_ALLUSERS... -; "Program Files" for AllUsers, "My Documents" for JustMe... - -Function .onInit - ; Reads components status for registry - !insertmacro SectionList "InitSection" - - ; check to see if /D has been used to change - ; the install directory by comparing it to the - ; install directory that is expected to be the - ; default - StrCpy $IS_DEFAULT_INSTALLDIR 0 - StrCmp "$INSTDIR" "@CPACK_NSIS_INSTALL_ROOT@\@CPACK_PACKAGE_INSTALL_DIRECTORY@" 0 +2 - StrCpy $IS_DEFAULT_INSTALLDIR 1 - - StrCpy $SV_ALLUSERS "JustMe" - ; if default install dir then change the default - ; if it is installed for JustMe - StrCmp "$IS_DEFAULT_INSTALLDIR" "1" 0 +2 - StrCpy $INSTDIR "$DOCUMENTS\@CPACK_PACKAGE_INSTALL_DIRECTORY@" - - ClearErrors - UserInfo::GetName - IfErrors noLM - Pop $0 - UserInfo::GetAccountType - Pop $1 - StrCmp $1 "Admin" 0 +3 - SetShellVarContext all - ;MessageBox MB_OK 'User "$0" is in the Admin group' - StrCpy $SV_ALLUSERS "AllUsers" - Goto done - StrCmp $1 "Power" 0 +3 - SetShellVarContext all - ;MessageBox MB_OK 'User "$0" is in the Power Users group' - StrCpy $SV_ALLUSERS "AllUsers" - Goto done - - noLM: - StrCpy $SV_ALLUSERS "AllUsers" - ;Get installation folder from registry if available - - done: - StrCmp $SV_ALLUSERS "AllUsers" 0 +3 - StrCmp "$IS_DEFAULT_INSTALLDIR" "1" 0 +2 - StrCpy $INSTDIR "@CPACK_NSIS_INSTALL_ROOT@\@CPACK_PACKAGE_INSTALL_DIRECTORY@" - - StrCmp "@CPACK_NSIS_MODIFY_PATH@" "ON" 0 noOptionsPage - !insertmacro MUI_INSTALLOPTIONS_EXTRACT "NSIS.InstallOptions.ini" - - noOptionsPage: -FunctionEnd diff --git a/cmake/Packaging/Fedora-15.cmake b/cmake/Packaging/Fedora-15.cmake deleted file mode 100644 index 4e648486e1..0000000000 --- a/cmake/Packaging/Fedora-15.cmake +++ /dev/null @@ -1,11 +0,0 @@ -SET(PACKAGE_DEPENDS_CORE_RUNTIME "fftw-libs") -SET(PACKAGE_DEPENDS_UTILS "python-mako") -SET(PACKAGE_DEPENDS_QTGUI_RUNTIME "qt" "qwt") -SET(PACKAGE_DEPENDS_QTGUI_PYTHON "PyQt4") -SET(PACKAGE_DEPENDS_GRC "python" "numpy" "gtk2" "python-lxml" "python-cheetah" "python-mako") -SET(PACKAGE_DEPENDS_WXGUI "wxGTK" "python" "numpy") -SET(PACKAGE_DEPENDS_VIDEO_SDL_RUNTIME "SDL") -SET(PACKAGE_DEPENDS_UHD_RUNTIME "uhd") -SET(PACKAGE_DEPENDS_AUDIO_RUNTIME "pulseaudio" "alsa-lib" "jack-audio-connection-kit") -SET(PACKAGE_DEPENDS_WAVELET_RUNTIME "gsl") -SET(PACKAGE_DEPENDS_WAVELET_PYTHON "python" "numpy") diff --git a/cmake/Packaging/Fedora-16.cmake b/cmake/Packaging/Fedora-16.cmake deleted file mode 100644 index 4e648486e1..0000000000 --- a/cmake/Packaging/Fedora-16.cmake +++ /dev/null @@ -1,11 +0,0 @@ -SET(PACKAGE_DEPENDS_CORE_RUNTIME "fftw-libs") -SET(PACKAGE_DEPENDS_UTILS "python-mako") -SET(PACKAGE_DEPENDS_QTGUI_RUNTIME "qt" "qwt") -SET(PACKAGE_DEPENDS_QTGUI_PYTHON "PyQt4") -SET(PACKAGE_DEPENDS_GRC "python" "numpy" "gtk2" "python-lxml" "python-cheetah" "python-mako") -SET(PACKAGE_DEPENDS_WXGUI "wxGTK" "python" "numpy") -SET(PACKAGE_DEPENDS_VIDEO_SDL_RUNTIME "SDL") -SET(PACKAGE_DEPENDS_UHD_RUNTIME "uhd") -SET(PACKAGE_DEPENDS_AUDIO_RUNTIME "pulseaudio" "alsa-lib" "jack-audio-connection-kit") -SET(PACKAGE_DEPENDS_WAVELET_RUNTIME "gsl") -SET(PACKAGE_DEPENDS_WAVELET_PYTHON "python" "numpy") diff --git a/cmake/Packaging/Fedora-17.cmake b/cmake/Packaging/Fedora-17.cmake deleted file mode 100644 index 4e7ff51f9f..0000000000 --- a/cmake/Packaging/Fedora-17.cmake +++ /dev/null @@ -1,11 +0,0 @@ -SET(PACKAGE_DEPENDS_CORE_RUNTIME "fftw-libs") -SET(PACKAGE_DEPENDS_UTILS "python-mako") -SET(PACKAGE_DEPENDS_QTGUI_RUNTIME "qt" "qwt") -SET(PACKAGE_DEPENDS_QTGUI_PYTHON "PyQt4") -SET(PACKAGE_DEPENDS_GRC "python" "numpy" "gtk2" "python-lxml" "python-cheetah") -SET(PACKAGE_DEPENDS_WXGUI "wxGTK" "python" "numpy" "PyOpenGL") -SET(PACKAGE_DEPENDS_VIDEO_SDL_RUNTIME "SDL") -SET(PACKAGE_DEPENDS_UHD_RUNTIME "uhd") -SET(PACKAGE_DEPENDS_AUDIO_RUNTIME "pulseaudio" "alsa-lib" "jack-audio-connection-kit") -SET(PACKAGE_DEPENDS_WAVELET_RUNTIME "gsl") -SET(PACKAGE_DEPENDS_WAVELET_PYTHON "python" "numpy") diff --git a/cmake/Packaging/Fedora-18.cmake b/cmake/Packaging/Fedora-18.cmake deleted file mode 100644 index 4e7ff51f9f..0000000000 --- a/cmake/Packaging/Fedora-18.cmake +++ /dev/null @@ -1,11 +0,0 @@ -SET(PACKAGE_DEPENDS_CORE_RUNTIME "fftw-libs") -SET(PACKAGE_DEPENDS_UTILS "python-mako") -SET(PACKAGE_DEPENDS_QTGUI_RUNTIME "qt" "qwt") -SET(PACKAGE_DEPENDS_QTGUI_PYTHON "PyQt4") -SET(PACKAGE_DEPENDS_GRC "python" "numpy" "gtk2" "python-lxml" "python-cheetah") -SET(PACKAGE_DEPENDS_WXGUI "wxGTK" "python" "numpy" "PyOpenGL") -SET(PACKAGE_DEPENDS_VIDEO_SDL_RUNTIME "SDL") -SET(PACKAGE_DEPENDS_UHD_RUNTIME "uhd") -SET(PACKAGE_DEPENDS_AUDIO_RUNTIME "pulseaudio" "alsa-lib" "jack-audio-connection-kit") -SET(PACKAGE_DEPENDS_WAVELET_RUNTIME "gsl") -SET(PACKAGE_DEPENDS_WAVELET_PYTHON "python" "numpy") diff --git a/cmake/Packaging/Ubuntu-10.04.cmake b/cmake/Packaging/Ubuntu-10.04.cmake deleted file mode 100644 index 7f0fe82211..0000000000 --- a/cmake/Packaging/Ubuntu-10.04.cmake +++ /dev/null @@ -1,11 +0,0 @@ -SET(PACKAGE_DEPENDS_CORE_RUNTIME "libfftw3-3") -SET(PACKAGE_DEPENDS_UTILS "python-mako") -SET(PACKAGE_DEPENDS_QTGUI_RUNTIME "libqtcore4" "libqwt5-qt4") -SET(PACKAGE_DEPENDS_QTGUI_PYTHON "python-qt4" "python-qwt5-qt4") -SET(PACKAGE_DEPENDS_GRC "python" "python-numpy" "python-gtk2" "python-lxml" "python-cheetah") -SET(PACKAGE_DEPENDS_WXGUI "python-wxgtk2.8" "python" "python-numpy") -SET(PACKAGE_DEPENDS_VIDEO_SDL_RUNTIME "libsdl1.2debian") -SET(PACKAGE_DEPENDS_UHD_RUNTIME "uhd") -SET(PACKAGE_DEPENDS_AUDIO_RUNTIME "libpulse0" "alsa-base" "libjack0") -SET(PACKAGE_DEPENDS_WAVELET_RUNTIME "libgsl0ldbl") -SET(PACKAGE_DEPENDS_WAVELET_PYTHON "python" "python-numpy") diff --git a/cmake/Packaging/Ubuntu-10.10.cmake b/cmake/Packaging/Ubuntu-10.10.cmake deleted file mode 100644 index 7f0fe82211..0000000000 --- a/cmake/Packaging/Ubuntu-10.10.cmake +++ /dev/null @@ -1,11 +0,0 @@ -SET(PACKAGE_DEPENDS_CORE_RUNTIME "libfftw3-3") -SET(PACKAGE_DEPENDS_UTILS "python-mako") -SET(PACKAGE_DEPENDS_QTGUI_RUNTIME "libqtcore4" "libqwt5-qt4") -SET(PACKAGE_DEPENDS_QTGUI_PYTHON "python-qt4" "python-qwt5-qt4") -SET(PACKAGE_DEPENDS_GRC "python" "python-numpy" "python-gtk2" "python-lxml" "python-cheetah") -SET(PACKAGE_DEPENDS_WXGUI "python-wxgtk2.8" "python" "python-numpy") -SET(PACKAGE_DEPENDS_VIDEO_SDL_RUNTIME "libsdl1.2debian") -SET(PACKAGE_DEPENDS_UHD_RUNTIME "uhd") -SET(PACKAGE_DEPENDS_AUDIO_RUNTIME "libpulse0" "alsa-base" "libjack0") -SET(PACKAGE_DEPENDS_WAVELET_RUNTIME "libgsl0ldbl") -SET(PACKAGE_DEPENDS_WAVELET_PYTHON "python" "python-numpy") diff --git a/cmake/Packaging/Ubuntu-11.04.cmake b/cmake/Packaging/Ubuntu-11.04.cmake deleted file mode 100644 index b72ff46e70..0000000000 --- a/cmake/Packaging/Ubuntu-11.04.cmake +++ /dev/null @@ -1,12 +0,0 @@ -#set the debian package dependencies (parsed by our deb component maker) -SET(PACKAGE_DEPENDS_CORE_RUNTIME "libfftw3-3") -SET(PACKAGE_DEPENDS_UTILS "python-mako") -SET(PACKAGE_DEPENDS_QTGUI_RUNTIME "libqtcore4" "libqwt5-qt4") -SET(PACKAGE_DEPENDS_QTGUI_PYTHON "python-qt4" "python-qwt5-qt4") -SET(PACKAGE_DEPENDS_GRC "python" "python-numpy" "python-gtk2" "python-lxml" "python-cheetah") -SET(PACKAGE_DEPENDS_WXGUI "python-wxgtk2.8") -SET(PACKAGE_DEPENDS_VIDEO_SDL_RUNTIME "libsdl1.2debian") -SET(PACKAGE_DEPENDS_UHD_RUNTIME "uhd") -SET(PACKAGE_DEPENDS_AUDIO_RUNTIME "libpulse0" "alsa-base" "libjack0") -SET(PACKAGE_DEPENDS_WAVELET_RUNTIME "libgsl0ldbl") -SET(PACKAGE_DEPENDS_WAVELET_PYTHON "python" "python-numpy") diff --git a/cmake/Packaging/Ubuntu-11.10.cmake b/cmake/Packaging/Ubuntu-11.10.cmake deleted file mode 100644 index 952eeb6026..0000000000 --- a/cmake/Packaging/Ubuntu-11.10.cmake +++ /dev/null @@ -1,11 +0,0 @@ -SET(PACKAGE_DEPENDS_CORE_RUNTIME "libfftw3-3") -SET(PACKAGE_DEPENDS_UTILS "python-mako") -SET(PACKAGE_DEPENDS_QTGUI_RUNTIME "libqtcore4" "libqwt6") -SET(PACKAGE_DEPENDS_QTGUI_PYTHON "python-qt4" "python-qwt5-qt4") -SET(PACKAGE_DEPENDS_GRC "python" "python-numpy" "python-gtk2" "python-lxml" "python-cheetah") -SET(PACKAGE_DEPENDS_WXGUI "python-wxgtk2.8") -SET(PACKAGE_DEPENDS_VIDEO_SDL_RUNTIME "libsdl1.2debian") -SET(PACKAGE_DEPENDS_UHD_RUNTIME "uhd") -SET(PACKAGE_DEPENDS_AUDIO_RUNTIME "libpulse0" "alsa-base" "libjack0") -SET(PACKAGE_DEPENDS_WAVELET_RUNTIME "libgsl0ldbl") -SET(PACKAGE_DEPENDS_WAVELET_PYTHON "python" "python-numpy") diff --git a/cmake/Packaging/Ubuntu-12.04.cmake b/cmake/Packaging/Ubuntu-12.04.cmake deleted file mode 100644 index 8d4b8d18d1..0000000000 --- a/cmake/Packaging/Ubuntu-12.04.cmake +++ /dev/null @@ -1,11 +0,0 @@ -SET(PACKAGE_DEPENDS_CORE_RUNTIME "libfftw3-3") -SET(PACKAGE_DEPENDS_UTILS "python-mako") -SET(PACKAGE_DEPENDS_QTGUI_RUNTIME "libqtcore4" "libqwt6") -SET(PACKAGE_DEPENDS_QTGUI_PYTHON "python-qt4" "python-qwt5-qt4") -SET(PACKAGE_DEPENDS_GRC "python" "python-numpy" "python-gtk2" "python-lxml" "python-cheetah") -SET(PACKAGE_DEPENDS_WXGUI "python-wxgtk2.8" "python-opengl") -SET(PACKAGE_DEPENDS_VIDEO_SDL_RUNTIME "libsdl1.2debian") -SET(PACKAGE_DEPENDS_UHD_RUNTIME "uhd") -SET(PACKAGE_DEPENDS_AUDIO_RUNTIME "libpulse0" "alsa-base" "libjack0") -SET(PACKAGE_DEPENDS_WAVELET_RUNTIME "libgsl0ldbl") -SET(PACKAGE_DEPENDS_WAVELET_PYTHON "python" "python-numpy") diff --git a/cmake/Packaging/Ubuntu-12.10.cmake b/cmake/Packaging/Ubuntu-12.10.cmake deleted file mode 100644 index 8d4b8d18d1..0000000000 --- a/cmake/Packaging/Ubuntu-12.10.cmake +++ /dev/null @@ -1,11 +0,0 @@ -SET(PACKAGE_DEPENDS_CORE_RUNTIME "libfftw3-3") -SET(PACKAGE_DEPENDS_UTILS "python-mako") -SET(PACKAGE_DEPENDS_QTGUI_RUNTIME "libqtcore4" "libqwt6") -SET(PACKAGE_DEPENDS_QTGUI_PYTHON "python-qt4" "python-qwt5-qt4") -SET(PACKAGE_DEPENDS_GRC "python" "python-numpy" "python-gtk2" "python-lxml" "python-cheetah") -SET(PACKAGE_DEPENDS_WXGUI "python-wxgtk2.8" "python-opengl") -SET(PACKAGE_DEPENDS_VIDEO_SDL_RUNTIME "libsdl1.2debian") -SET(PACKAGE_DEPENDS_UHD_RUNTIME "uhd") -SET(PACKAGE_DEPENDS_AUDIO_RUNTIME "libpulse0" "alsa-base" "libjack0") -SET(PACKAGE_DEPENDS_WAVELET_RUNTIME "libgsl0ldbl") -SET(PACKAGE_DEPENDS_WAVELET_PYTHON "python" "python-numpy") diff --git a/cmake/Packaging/Ubuntu-13.04.cmake b/cmake/Packaging/Ubuntu-13.04.cmake deleted file mode 100644 index ed14b1ab22..0000000000 --- a/cmake/Packaging/Ubuntu-13.04.cmake +++ /dev/null @@ -1,13 +0,0 @@ -SET(PACKAGE_DEPENDS_GRUEL_RUNTIME "libboost-all-dev" "libc6") -SET(PACKAGE_DEPENDS_UTILS "python-mako") -SET(PACKAGE_DEPENDS_GRUEL_PYTHON "python" "python-numpy") -SET(PACKAGE_DEPENDS_CORE_RUNTIME "libfftw3-3") -SET(PACKAGE_DEPENDS_QTGUI_RUNTIME "libqtcore4" "libqwt6") -SET(PACKAGE_DEPENDS_QTGUI_PYTHON "python-qt4" "python-qwt5-qt4") -SET(PACKAGE_DEPENDS_GRC "python" "python-numpy" "python-gtk2" "python-lxml" "python-cheetah") -SET(PACKAGE_DEPENDS_WXGUI "python-wxgtk2.8" "python-opengl") -SET(PACKAGE_DEPENDS_VIDEO_SDL_RUNTIME "libsdl1.2debian") -SET(PACKAGE_DEPENDS_UHD_RUNTIME "uhd") -SET(PACKAGE_DEPENDS_AUDIO_RUNTIME "libpulse0" "alsa-base" "libjack0") -SET(PACKAGE_DEPENDS_WAVELET_RUNTIME "libgsl0ldbl") -SET(PACKAGE_DEPENDS_WAVELET_PYTHON "python" "python-numpy") diff --git a/cmake/Packaging/Ubuntu-15.10.cmake b/cmake/Packaging/Ubuntu-15.10.cmake deleted file mode 100644 index ed14b1ab22..0000000000 --- a/cmake/Packaging/Ubuntu-15.10.cmake +++ /dev/null @@ -1,13 +0,0 @@ -SET(PACKAGE_DEPENDS_GRUEL_RUNTIME "libboost-all-dev" "libc6") -SET(PACKAGE_DEPENDS_UTILS "python-mako") -SET(PACKAGE_DEPENDS_GRUEL_PYTHON "python" "python-numpy") -SET(PACKAGE_DEPENDS_CORE_RUNTIME "libfftw3-3") -SET(PACKAGE_DEPENDS_QTGUI_RUNTIME "libqtcore4" "libqwt6") -SET(PACKAGE_DEPENDS_QTGUI_PYTHON "python-qt4" "python-qwt5-qt4") -SET(PACKAGE_DEPENDS_GRC "python" "python-numpy" "python-gtk2" "python-lxml" "python-cheetah") -SET(PACKAGE_DEPENDS_WXGUI "python-wxgtk2.8" "python-opengl") -SET(PACKAGE_DEPENDS_VIDEO_SDL_RUNTIME "libsdl1.2debian") -SET(PACKAGE_DEPENDS_UHD_RUNTIME "uhd") -SET(PACKAGE_DEPENDS_AUDIO_RUNTIME "libpulse0" "alsa-base" "libjack0") -SET(PACKAGE_DEPENDS_WAVELET_RUNTIME "libgsl0ldbl") -SET(PACKAGE_DEPENDS_WAVELET_PYTHON "python" "python-numpy") diff --git a/cmake/Packaging/post_install.in b/cmake/Packaging/post_install.in deleted file mode 100755 index e7245f0320..0000000000 --- a/cmake/Packaging/post_install.in +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -@CMAKE_INSTALL_PREFIX@/libexec/gnuradio/grc_setup_freedesktop install -ldconfig diff --git a/cmake/Packaging/post_uninstall.in b/cmake/Packaging/post_uninstall.in deleted file mode 100755 index 2d1871b1df..0000000000 --- a/cmake/Packaging/post_uninstall.in +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -ldconfig diff --git a/cmake/Packaging/postinst.in b/cmake/Packaging/postinst.in deleted file mode 100755 index 7fef2accf4..0000000000 --- a/cmake/Packaging/postinst.in +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -if [ "$1" = "configure" ]; then - @CMAKE_INSTALL_PREFIX@/libexec/gnuradio/grc_setup_freedesktop install - ldconfig -fi diff --git a/cmake/Packaging/postrm.in b/cmake/Packaging/postrm.in deleted file mode 100755 index b780602a7b..0000000000 --- a/cmake/Packaging/postrm.in +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -if [ "$1" = "remove" ]; then - ldconfig -fi diff --git a/cmake/Packaging/pre_install.in b/cmake/Packaging/pre_install.in deleted file mode 100755 index 1a2485251c..0000000000 --- a/cmake/Packaging/pre_install.in +++ /dev/null @@ -1 +0,0 @@ -#!/bin/sh diff --git a/cmake/Packaging/pre_uninstall.in b/cmake/Packaging/pre_uninstall.in deleted file mode 100755 index c5e085e895..0000000000 --- a/cmake/Packaging/pre_uninstall.in +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -@CMAKE_INSTALL_PREFIX@/libexec/gnuradio/grc_setup_freedesktop uninstall diff --git a/cmake/Packaging/preinst.in b/cmake/Packaging/preinst.in deleted file mode 100755 index cb7ee1bc40..0000000000 --- a/cmake/Packaging/preinst.in +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -if [ "$1" = "install" ]; then - echo -fi diff --git a/cmake/Packaging/prerm.in b/cmake/Packaging/prerm.in deleted file mode 100755 index d098878503..0000000000 --- a/cmake/Packaging/prerm.in +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -if [ "$1" = "remove" ]; then - @CMAKE_INSTALL_PREFIX@/libexec/gnuradio/grc_setup_freedesktop uninstall -fi diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt index 98d7d1c419..b9eb977a3a 100644 --- a/docs/CMakeLists.txt +++ b/docs/CMakeLists.txt @@ -36,15 +36,6 @@ GR_REGISTER_COMPONENT("sphinx" ENABLE_SPHINX SPHINX_FOUND) if(ENABLE_DOXYGEN) ######################################################################## -# Setup CPack components -######################################################################## -include(GrPackage) -CPACK_COMPONENT("docs" - DISPLAY_NAME "Documentation" - DESCRIPTION "Doxygen generated documentation" -) - -######################################################################## # Add subdirectories ######################################################################## add_subdirectory(doxygen) @@ -58,14 +49,6 @@ endif(ENABLE_DOXYGEN) ######################################################################## if(ENABLE_SPHINX) -######################################################################## -# Setup CPack components -######################################################################## -include(GrPackage) -CPACK_COMPONENT("docs" - DISPLAY_NAME "Documentation" - DESCRIPTION "Sphinx generated documentation" -) ######################################################################## # Add subdirectories diff --git a/docs/doxygen/CMakeLists.txt b/docs/doxygen/CMakeLists.txt index a837bd8e11..d22f9d9f62 100644 --- a/docs/doxygen/CMakeLists.txt +++ b/docs/doxygen/CMakeLists.txt @@ -74,4 +74,4 @@ add_custom_command( add_custom_target(doxygen_target ALL DEPENDS ${BUILT_DIRS}) -install(DIRECTORY ${BUILT_DIRS} DESTINATION ${GR_PKG_DOC_DIR} COMPONENT "docs") +install(DIRECTORY ${BUILT_DIRS} DESTINATION ${GR_PKG_DOC_DIR}) diff --git a/docs/exploring-gnuradio/CMakeLists.txt b/docs/exploring-gnuradio/CMakeLists.txt index 5f5e2113cd..422b1ce85c 100644 --- a/docs/exploring-gnuradio/CMakeLists.txt +++ b/docs/exploring-gnuradio/CMakeLists.txt @@ -26,5 +26,4 @@ install( fm_rx.grc fm_demod.py DESTINATION ${GR_PKG_DOC_DIR} - COMPONENT "docs" ) diff --git a/gnuradio-runtime/CMakeLists.txt b/gnuradio-runtime/CMakeLists.txt index 7660642509..67efafe2ae 100644 --- a/gnuradio-runtime/CMakeLists.txt +++ b/gnuradio-runtime/CMakeLists.txt @@ -89,39 +89,6 @@ get_filename_component(GR_RUNTIME_PYTHONPATH ) GR_SET_GLOBAL(GR_RUNTIME_PYTHONPATH ${GR_RUNTIME_PYTHONPATH}) -######################################################################## -# Setup CPack components -######################################################################## -include(GrPackage) -CPACK_SET(CPACK_COMPONENT_GROUP_RUNTIME_DESCRIPTION "GNU Radio Runtime") - -CPACK_COMPONENT("runtime_runtime" - GROUP "Runtime" - DISPLAY_NAME "Runtime" - DESCRIPTION "Dynamic link libraries" - DEPENDS "runtime_runtime" -) - -CPACK_COMPONENT("runtime_devel" - GROUP "Runtime" - DISPLAY_NAME "Development" - DESCRIPTION "C++ headers, package config, import libraries" - DEPENDS "runtime_devel" -) - -CPACK_COMPONENT("runtime_python" - GROUP "Runtime" - DISPLAY_NAME "Python" - DESCRIPTION "Python modules for runtime" - DEPENDS "runtime_python;runtime_runtime" -) - -CPACK_COMPONENT("runtime_swig" - GROUP "Runtime" - DISPLAY_NAME "SWIG" - DESCRIPTION "SWIG development .i files" - DEPENDS "runtime_swig;runtime_python;runtime_devel" -) configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/gnuradio-runtime.conf.in ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-runtime.conf @@ -130,14 +97,12 @@ configure_file( install( FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-runtime.conf DESTINATION ${GR_PREFSDIR} - COMPONENT "runtime_runtime" ) if(ENABLE_GR_LOG AND HAVE_LOG4CPP) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/gr_log_default.conf DESTINATION ${GR_PREFSDIR} - COMPONENT "runtime_runtime" ) endif(ENABLE_GR_LOG AND HAVE_LOG4CPP) @@ -166,7 +131,6 @@ configure_file( install( FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-runtime.pc DESTINATION ${GR_LIBRARY_DIR}/pkgconfig - COMPONENT "runtime_devel" ) endif(ENABLE_GNURADIO_RUNTIME) diff --git a/gnuradio-runtime/apps/CMakeLists.txt b/gnuradio-runtime/apps/CMakeLists.txt index 3dea7268ff..4a73f3c18f 100644 --- a/gnuradio-runtime/apps/CMakeLists.txt +++ b/gnuradio-runtime/apps/CMakeLists.txt @@ -37,5 +37,4 @@ target_link_libraries(gnuradio-config-info gnuradio-runtime ${Boost_LIBRARIES}) install( TARGETS gnuradio-config-info DESTINATION ${GR_RUNTIME_DIR} - COMPONENT "runtime_runtime" ) diff --git a/gnuradio-runtime/examples/mp-sched/CMakeLists.txt b/gnuradio-runtime/examples/mp-sched/CMakeLists.txt index 863cfa733a..4e07366d4f 100644 --- a/gnuradio-runtime/examples/mp-sched/CMakeLists.txt +++ b/gnuradio-runtime/examples/mp-sched/CMakeLists.txt @@ -26,11 +26,9 @@ GR_PYTHON_INSTALL(PROGRAMS synthetic.py wfm_rcv_pll_to_wav.py DESTINATION ${GR_PKG_DATA_DIR}/examples/mp-sched - COMPONENT "runtime_python" ) install( FILES README DESTINATION ${GR_PKG_DATA_DIR}/examples/mp-sched - COMPONENT "runtime_python" ) diff --git a/gnuradio-runtime/examples/network/CMakeLists.txt b/gnuradio-runtime/examples/network/CMakeLists.txt index 92eb734768..08f498b469 100644 --- a/gnuradio-runtime/examples/network/CMakeLists.txt +++ b/gnuradio-runtime/examples/network/CMakeLists.txt @@ -25,6 +25,4 @@ GR_PYTHON_INSTALL(PROGRAMS vector_sink.py vector_source.py DESTINATION ${GR_PKG_DATA_DIR}/examples/network - COMPONENT "runtime_python" ) - diff --git a/gnuradio-runtime/examples/volk_benchmark/CMakeLists.txt b/gnuradio-runtime/examples/volk_benchmark/CMakeLists.txt index f56675e556..076ef359e8 100644 --- a/gnuradio-runtime/examples/volk_benchmark/CMakeLists.txt +++ b/gnuradio-runtime/examples/volk_benchmark/CMakeLists.txt @@ -25,11 +25,9 @@ GR_PYTHON_INSTALL(PROGRAMS volk_test_funcs.py volk_types.py DESTINATION ${GR_PKG_DATA_DIR}/examples/volk_benchmark - COMPONENT "runtime_python" ) install( FILES README DESTINATION ${GR_PKG_DATA_DIR}/examples/volk_benchmark - COMPONENT "runtime_python" ) diff --git a/gnuradio-runtime/include/gnuradio/CMakeLists.txt b/gnuradio-runtime/include/gnuradio/CMakeLists.txt index 472f91847b..ac2e59bca9 100644 --- a/gnuradio-runtime/include/gnuradio/CMakeLists.txt +++ b/gnuradio-runtime/include/gnuradio/CMakeLists.txt @@ -83,7 +83,6 @@ install(FILES rpcserver_selector.h ${CMAKE_CURRENT_BINARY_DIR}/logger.h DESTINATION ${GR_INCLUDE_DIR}/gnuradio - COMPONENT "runtime_devel" ) if(THRIFT_FOUND) @@ -92,7 +91,6 @@ install(FILES thrift_application_base.h thrift_server_template.h DESTINATION ${GR_INCLUDE_DIR}/gnuradio - COMPONENT "runtime_devel" ) endif(THRIFT_FOUND) diff --git a/gnuradio-runtime/include/gnuradio/messages/CMakeLists.txt b/gnuradio-runtime/include/gnuradio/messages/CMakeLists.txt index f79f2bd24f..7504cfeeb1 100644 --- a/gnuradio-runtime/include/gnuradio/messages/CMakeLists.txt +++ b/gnuradio-runtime/include/gnuradio/messages/CMakeLists.txt @@ -27,5 +27,4 @@ install(FILES msg_producer.h msg_queue.h DESTINATION ${GR_INCLUDE_DIR}/gnuradio/messages - COMPONENT "runtime_devel" ) diff --git a/gnuradio-runtime/include/gnuradio/thread/CMakeLists.txt b/gnuradio-runtime/include/gnuradio/thread/CMakeLists.txt index 8ea4bfc66e..b9a4a98c13 100644 --- a/gnuradio-runtime/include/gnuradio/thread/CMakeLists.txt +++ b/gnuradio-runtime/include/gnuradio/thread/CMakeLists.txt @@ -25,5 +25,4 @@ install(FILES thread_body_wrapper.h thread_group.h DESTINATION ${GR_INCLUDE_DIR}/gnuradio/thread - COMPONENT "runtime_devel" ) diff --git a/gnuradio-runtime/include/pmt/CMakeLists.txt b/gnuradio-runtime/include/pmt/CMakeLists.txt index 4ae0e22431..f4a541e0dd 100644 --- a/gnuradio-runtime/include/pmt/CMakeLists.txt +++ b/gnuradio-runtime/include/pmt/CMakeLists.txt @@ -26,4 +26,4 @@ install(FILES pmt_pool.h pmt_sugar.h DESTINATION ${GR_INCLUDE_DIR}/pmt - COMPONENT "runtime_devel") +) diff --git a/gnuradio-runtime/lib/CMakeLists.txt b/gnuradio-runtime/lib/CMakeLists.txt index 3da550d37b..e0196b669a 100644 --- a/gnuradio-runtime/lib/CMakeLists.txt +++ b/gnuradio-runtime/lib/CMakeLists.txt @@ -203,7 +203,7 @@ endif(TRY_SHM_VMCIRCBUF) ####################################################### add_library(gnuradio-runtime SHARED ${gnuradio_runtime_sources}) target_link_libraries(gnuradio-runtime ${gnuradio_runtime_libs}) -GR_LIBRARY_FOO(gnuradio-runtime RUNTIME_COMPONENT "runtime_runtime" DEVEL_COMPONENT "runtime_devel") +GR_LIBRARY_FOO(gnuradio-runtime) add_dependencies(gnuradio-runtime pmt_generated runtime_generated_includes @@ -241,7 +241,7 @@ if(ENABLE_STATIC_LIBS) endif(NOT WIN32) install(TARGETS gnuradio-runtime_static - ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT "runtime_devel" # .lib file + ARCHIVE DESTINATION lib${LIB_SUFFIX} # .lib file ) endif(ENABLE_STATIC_LIBS) diff --git a/gnuradio-runtime/lib/controlport/CMakeLists.txt b/gnuradio-runtime/lib/controlport/CMakeLists.txt index c9bdeb949e..80d31fc721 100644 --- a/gnuradio-runtime/lib/controlport/CMakeLists.txt +++ b/gnuradio-runtime/lib/controlport/CMakeLists.txt @@ -84,7 +84,6 @@ list(APPEND gnuradio_runtime_libs install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/thrift/thrift.conf.example DESTINATION ${SYSCONFDIR}/${CMAKE_PROJECT_NAME} - COMPONENT "runtime_runtime" ) endif(THRIFT_FOUND) diff --git a/gnuradio-runtime/lib/pmt/CMakeLists.txt b/gnuradio-runtime/lib/pmt/CMakeLists.txt index 32c0e57a6a..e5c8f2f47e 100644 --- a/gnuradio-runtime/lib/pmt/CMakeLists.txt +++ b/gnuradio-runtime/lib/pmt/CMakeLists.txt @@ -44,7 +44,6 @@ add_custom_command( install( FILES ${PMT_SERIAL_TAGS_H} DESTINATION ${GR_INCLUDE_DIR}/pmt - COMPONENT "runtime_devel" ) include(AddFileDependencies) @@ -108,7 +107,7 @@ endif(MSVC) add_library(gnuradio-pmt SHARED ${pmt_sources}) target_link_libraries(gnuradio-pmt ${gnuradio_pmt_libs}) -GR_LIBRARY_FOO(gnuradio-pmt RUNTIME_COMPONENT "runtime_runtime" DEVEL_COMPONENT "runtime_devel") +GR_LIBRARY_FOO(gnuradio-pmt) add_dependencies(gnuradio-pmt pmt_generated @@ -125,7 +124,7 @@ if(ENABLE_STATIC_LIBS) endif(NOT WIN32) install(TARGETS gnuradio-pmt_static - ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT "runtime_devel" # .lib file + ARCHIVE DESTINATION lib${LIB_SUFFIX} # .lib file ) endif(ENABLE_STATIC_LIBS) diff --git a/gnuradio-runtime/python/gnuradio/CMakeLists.txt b/gnuradio-runtime/python/gnuradio/CMakeLists.txt index d29e6aa9d2..736db499dc 100644 --- a/gnuradio-runtime/python/gnuradio/CMakeLists.txt +++ b/gnuradio-runtime/python/gnuradio/CMakeLists.txt @@ -35,5 +35,4 @@ GR_PYTHON_INSTALL(FILES gr_unittest.py gr_xmlrunner.py DESTINATION ${GR_PYTHON_DIR}/gnuradio - COMPONENT "runtime_python" ) diff --git a/gnuradio-runtime/python/gnuradio/ctrlport/CMakeLists.txt b/gnuradio-runtime/python/gnuradio/ctrlport/CMakeLists.txt index f40f253a72..ecf24178f9 100644 --- a/gnuradio-runtime/python/gnuradio/ctrlport/CMakeLists.txt +++ b/gnuradio-runtime/python/gnuradio/ctrlport/CMakeLists.txt @@ -24,7 +24,6 @@ install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/icon.png DESTINATION ${GR_PYTHON_DIR}/gnuradio/ctrlport - COMPONENT "runtime_python" ) @@ -36,7 +35,6 @@ GR_PYTHON_INSTALL( ${CMAKE_CURRENT_SOURCE_DIR}/GNURadioControlPortClient.py ${CMAKE_CURRENT_SOURCE_DIR}/RPCConnection.py DESTINATION ${GR_PYTHON_DIR}/gnuradio/ctrlport/ - COMPONENT "runtime_python" ) GR_PYTHON_INSTALL( @@ -45,7 +43,6 @@ GR_PYTHON_INSTALL( ${CMAKE_CURRENT_SOURCE_DIR}/gr-ctrlport-monitor DESTINATION ${GR_RUNTIME_DIR} PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE - COMPONENT "runtime_python" ) if(THRIFT_FOUND) @@ -60,7 +57,6 @@ GR_PYTHON_INSTALL( FILES ${CMAKE_CURRENT_SOURCE_DIR}/RPCConnectionThrift.py DESTINATION ${GR_PYTHON_DIR}/gnuradio/ctrlport/ - COMPONENT "runtime_python" ) GR_PYTHON_INSTALL( @@ -73,7 +69,6 @@ GR_PYTHON_INSTALL( ${CMAKE_CURRENT_BINARY_DIR}/GNURadio/StreamReceiver-remote ${CMAKE_CURRENT_BINARY_DIR}/GNURadio/ttypes.py DESTINATION ${GR_PYTHON_DIR}/gnuradio/ctrlport/GNURadio - COMPONENT "runtime_python" ) endif(THRIFT_FOUND) diff --git a/gnuradio-runtime/python/gnuradio/gr/CMakeLists.txt b/gnuradio-runtime/python/gnuradio/gr/CMakeLists.txt index ddad2c448a..fc966b8ece 100644 --- a/gnuradio-runtime/python/gnuradio/gr/CMakeLists.txt +++ b/gnuradio-runtime/python/gnuradio/gr/CMakeLists.txt @@ -32,7 +32,6 @@ GR_PYTHON_INSTALL(FILES top_block.py pubsub.py DESTINATION ${GR_PYTHON_DIR}/gnuradio/gr - COMPONENT "runtime_python" ) ######################################################################## diff --git a/gnuradio-runtime/python/gnuradio/gru/CMakeLists.txt b/gnuradio-runtime/python/gnuradio/gru/CMakeLists.txt index f0276a8d53..c1d7b701a9 100644 --- a/gnuradio-runtime/python/gnuradio/gru/CMakeLists.txt +++ b/gnuradio-runtime/python/gnuradio/gru/CMakeLists.txt @@ -32,5 +32,4 @@ GR_PYTHON_INSTALL(FILES socket_stuff.py daemon.py DESTINATION ${GR_PYTHON_DIR}/gnuradio/gru - COMPONENT "runtime_python" ) diff --git a/gnuradio-runtime/python/pmt/CMakeLists.txt b/gnuradio-runtime/python/pmt/CMakeLists.txt index f4cba41d34..1ddfc2a46f 100644 --- a/gnuradio-runtime/python/pmt/CMakeLists.txt +++ b/gnuradio-runtime/python/pmt/CMakeLists.txt @@ -26,7 +26,6 @@ GR_PYTHON_INSTALL(FILES __init__.py pmt_to_python.py DESTINATION ${GR_PYTHON_DIR}/pmt - COMPONENT "runtime_python" ) ######################################################################## diff --git a/gnuradio-runtime/swig/CMakeLists.txt b/gnuradio-runtime/swig/CMakeLists.txt index ca9ddd4039..51e9e33356 100644 --- a/gnuradio-runtime/swig/CMakeLists.txt +++ b/gnuradio-runtime/swig/CMakeLists.txt @@ -52,7 +52,6 @@ GR_SWIG_MAKE(pmt_swig pmt_swig.i) GR_SWIG_INSTALL( TARGETS pmt_swig DESTINATION ${GR_PYTHON_DIR}/pmt - COMPONENT "runtime_python" ) add_custom_target(pmt_swig DEPENDS ${SWIG_MODULE_pmt_swig_REAL_NAME}) @@ -82,7 +81,6 @@ GR_SWIG_MAKE(runtime_swig runtime_swig.i) GR_SWIG_INSTALL( TARGETS runtime_swig DESTINATION ${GR_PYTHON_DIR}/gnuradio/gr - COMPONENT "runtime_python" ) install( @@ -124,5 +122,4 @@ install( ${CMAKE_CURRENT_BINARY_DIR}/runtime_swig_doc.i ${CMAKE_CURRENT_BINARY_DIR}/pmt_swig_doc.i DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig - COMPONENT "runtime_swig" ) diff --git a/gr-analog/CMakeLists.txt b/gr-analog/CMakeLists.txt index e0be42a0a5..3be716d7ab 100644 --- a/gr-analog/CMakeLists.txt +++ b/gr-analog/CMakeLists.txt @@ -51,40 +51,6 @@ SET(GR_PKG_ANALOG_EXAMPLES_DIR ${GR_PKG_DATA_DIR}/examples/analog) if(ENABLE_GR_ANALOG) ######################################################################## -# Setup CPack components -######################################################################## -include(GrPackage) -CPACK_SET(CPACK_COMPONENT_GROUP_ANALOG_DESCRIPTION "GNU Radio Analog Blocks") - -CPACK_COMPONENT("analog_runtime" - GROUP "Analog" - DISPLAY_NAME "Runtime" - DESCRIPTION "Dynamic link libraries" - DEPENDS "runtime_runtime" -) - -CPACK_COMPONENT("analog_devel" - GROUP "Analog" - DISPLAY_NAME "Development" - DESCRIPTION "C++ headers, package config, import libraries" - DEPENDS "runtime_devel" -) - -CPACK_COMPONENT("analog_python" - GROUP "Analog" - DISPLAY_NAME "Python" - DESCRIPTION "Python modules for runtime" - DEPENDS "runtime_python;analog_runtime" -) - -CPACK_COMPONENT("analog_swig" - GROUP "Analog" - DISPLAY_NAME "SWIG" - DESCRIPTION "SWIG development .i files" - DEPENDS "runtime_swig;analog_python;analog_devel" -) - -######################################################################## # Add subdirectories ######################################################################## add_subdirectory(include/gnuradio/analog) @@ -109,7 +75,6 @@ configure_file( install( FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-analog.pc DESTINATION ${GR_LIBRARY_DIR}/pkgconfig - COMPONENT "analog_devel" ) endif(ENABLE_GR_ANALOG) diff --git a/gr-analog/examples/CMakeLists.txt b/gr-analog/examples/CMakeLists.txt index acb0656b7f..fb23bdf4a0 100644 --- a/gr-analog/examples/CMakeLists.txt +++ b/gr-analog/examples/CMakeLists.txt @@ -23,12 +23,10 @@ include(GrPython) GR_PYTHON_INSTALL(PROGRAMS fmtest.py DESTINATION ${GR_PKG_ANALOG_EXAMPLES_DIR} - COMPONENT "analog_python" ) install( FILES noise_power.grc DESTINATION ${GR_PKG_ANALOG_EXAMPLES_DIR} - COMPONENT "analog_python" ) diff --git a/gr-analog/examples/tags/CMakeLists.txt b/gr-analog/examples/tags/CMakeLists.txt index ba95100665..9e51cee16a 100644 --- a/gr-analog/examples/tags/CMakeLists.txt +++ b/gr-analog/examples/tags/CMakeLists.txt @@ -22,5 +22,4 @@ include(GrPython) GR_PYTHON_INSTALL(PROGRAMS uhd_burst_detector.py DESTINATION ${GR_PKG_DATA_DIR}/examples/tags - COMPONENT "runtime_python" ) diff --git a/gr-analog/grc/CMakeLists.txt b/gr-analog/grc/CMakeLists.txt index a699d7c2fa..1251af5b83 100644 --- a/gr-analog/grc/CMakeLists.txt +++ b/gr-analog/grc/CMakeLists.txt @@ -18,5 +18,4 @@ # Boston, MA 02110-1301, USA. file(GLOB xml_files "*.xml") -install(FILES ${xml_files} DESTINATION ${GRC_BLOCKS_DIR} COMPONENT "analog_python") - +install(FILES ${xml_files} DESTINATION ${GRC_BLOCKS_DIR}) diff --git a/gr-analog/include/gnuradio/analog/CMakeLists.txt b/gr-analog/include/gnuradio/analog/CMakeLists.txt index b5333639d6..24b9ad95d1 100644 --- a/gr-analog/include/gnuradio/analog/CMakeLists.txt +++ b/gr-analog/include/gnuradio/analog/CMakeLists.txt @@ -68,6 +68,5 @@ install(FILES sig_source_waveform.h simple_squelch_cc.h DESTINATION ${GR_INCLUDE_DIR}/gnuradio/analog - COMPONENT "analog_devel" ) diff --git a/gr-analog/lib/CMakeLists.txt b/gr-analog/lib/CMakeLists.txt index a75d70337b..a3b279f900 100644 --- a/gr-analog/lib/CMakeLists.txt +++ b/gr-analog/lib/CMakeLists.txt @@ -106,7 +106,7 @@ list(APPEND analog_libs add_library(gnuradio-analog SHARED ${analog_sources}) target_link_libraries(gnuradio-analog ${analog_libs}) -GR_LIBRARY_FOO(gnuradio-analog RUNTIME_COMPONENT "analog_runtime" DEVEL_COMPONENT "analog_devel") +GR_LIBRARY_FOO(gnuradio-analog) add_dependencies(gnuradio-analog analog_generated_includes analog_generated_swigs gnuradio-filter) if(ENABLE_STATIC_LIBS) @@ -122,7 +122,7 @@ if(ENABLE_STATIC_LIBS) endif(NOT WIN32) install(TARGETS gnuradio-analog_static - ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT "analog_devel" # .lib file + ARCHIVE DESTINATION lib${LIB_SUFFIX} # .lib file ) endif(ENABLE_STATIC_LIBS) diff --git a/gr-analog/python/analog/CMakeLists.txt b/gr-analog/python/analog/CMakeLists.txt index 2da8273c6c..1fed9d1890 100644 --- a/gr-analog/python/analog/CMakeLists.txt +++ b/gr-analog/python/analog/CMakeLists.txt @@ -36,7 +36,6 @@ GR_PYTHON_INSTALL( wfm_rcv_pll.py wfm_tx.py DESTINATION ${GR_PYTHON_DIR}/gnuradio/analog - COMPONENT "analog_python" ) ######################################################################## diff --git a/gr-analog/swig/CMakeLists.txt b/gr-analog/swig/CMakeLists.txt index 38fef3a236..3636cce16d 100644 --- a/gr-analog/swig/CMakeLists.txt +++ b/gr-analog/swig/CMakeLists.txt @@ -50,7 +50,6 @@ GR_SWIG_MAKE(analog_swig analog_swig.i) GR_SWIG_INSTALL( TARGETS analog_swig DESTINATION ${GR_PYTHON_DIR}/gnuradio/analog - COMPONENT "analog_python" ) install( @@ -58,5 +57,4 @@ install( analog_swig.i ${CMAKE_CURRENT_BINARY_DIR}/analog_swig_doc.i DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig - COMPONENT "analog_swig" ) diff --git a/gr-audio/CMakeLists.txt b/gr-audio/CMakeLists.txt index 99e0bc174b..2185fd3690 100644 --- a/gr-audio/CMakeLists.txt +++ b/gr-audio/CMakeLists.txt @@ -43,47 +43,6 @@ SET(GR_PKG_AUDIO_EXAMPLES_DIR ${GR_PKG_DATA_DIR}/examples/audio) if(ENABLE_GR_AUDIO) ######################################################################## -# Setup CPack components -######################################################################## -include(GrPackage) -CPACK_SET(CPACK_COMPONENT_GROUP_AUDIO_DESCRIPTION "GNU Radio Audio Blocks") - -CPACK_COMPONENT("audio_runtime" - GROUP "Audio" - DISPLAY_NAME "Runtime" - DESCRIPTION "Runtime" - DEPENDS "runtime_runtime" -) - -CPACK_COMPONENT("audio_devel" - GROUP "Audio" - DISPLAY_NAME "Development" - DESCRIPTION "C++ headers, package config, import libraries" - DEPENDS "runtime_devel" -) - -CPACK_COMPONENT("audio_python" - GROUP "Audio" - DISPLAY_NAME "Python" - DESCRIPTION "Python modules for runtime; GRC xml files" - DEPENDS "runtime_python;audio_runtime" -) - -CPACK_COMPONENT("audio_examples" - GROUP "Audio" - DISPLAY_NAME "Examples" - DESCRIPTION "Example programs" - DEPENDS "audio_runtime" -) - -CPACK_COMPONENT("audio_swig" - GROUP "Audio" - DISPLAY_NAME "SWIG" - DESCRIPTION "SWIG development .i files" - DEPENDS "runtime_swig;audio_python;audio_devel" -) - -######################################################################## # Add subdirectories ######################################################################## add_subdirectory(lib) @@ -112,7 +71,6 @@ configure_file( install( FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-audio.pc DESTINATION ${GR_LIBRARY_DIR}/pkgconfig - COMPONENT "audio_devel" ) endif(ENABLE_GR_AUDIO) diff --git a/gr-audio/examples/c++/CMakeLists.txt b/gr-audio/examples/c++/CMakeLists.txt index 205bdeb287..202a79afe7 100644 --- a/gr-audio/examples/c++/CMakeLists.txt +++ b/gr-audio/examples/c++/CMakeLists.txt @@ -31,5 +31,4 @@ target_link_libraries(dial_tone INSTALL(TARGETS dial_tone DESTINATION ${GR_PKG_AUDIO_EXAMPLES_DIR} - COMPONENT "audio_examples" ) diff --git a/gr-audio/examples/grc/CMakeLists.txt b/gr-audio/examples/grc/CMakeLists.txt index 179b42fcc7..d0d0d568c7 100644 --- a/gr-audio/examples/grc/CMakeLists.txt +++ b/gr-audio/examples/grc/CMakeLists.txt @@ -22,6 +22,5 @@ install( cvsd_sweep.grc dial_tone.grc DESTINATION ${GR_PKG_AUDIO_EXAMPLES_DIR} - COMPONENT "audio_python" ) diff --git a/gr-audio/examples/python/CMakeLists.txt b/gr-audio/examples/python/CMakeLists.txt index 24e29e2348..01a03fefcd 100644 --- a/gr-audio/examples/python/CMakeLists.txt +++ b/gr-audio/examples/python/CMakeLists.txt @@ -33,5 +33,4 @@ GR_PYTHON_INSTALL(PROGRAMS spectrum_inversion.py test_resampler.py DESTINATION ${GR_PKG_AUDIO_EXAMPLES_DIR} - COMPONENT "audio_python" ) diff --git a/gr-audio/grc/CMakeLists.txt b/gr-audio/grc/CMakeLists.txt index 35c540ad3c..7da5fbc352 100644 --- a/gr-audio/grc/CMakeLists.txt +++ b/gr-audio/grc/CMakeLists.txt @@ -19,4 +19,4 @@ ######################################################################## file(GLOB xml_files "*.xml") -install(FILES ${xml_files} DESTINATION ${GRC_BLOCKS_DIR} COMPONENT "audio_python") +install(FILES ${xml_files} DESTINATION ${GRC_BLOCKS_DIR}) diff --git a/gr-audio/include/gnuradio/audio/CMakeLists.txt b/gr-audio/include/gnuradio/audio/CMakeLists.txt index 7e068e3f32..754da454f7 100644 --- a/gr-audio/include/gnuradio/audio/CMakeLists.txt +++ b/gr-audio/include/gnuradio/audio/CMakeLists.txt @@ -29,5 +29,4 @@ endif(OSX_AUDIO_VALID) install(FILES ${gr_audio_install_files} DESTINATION ${GR_INCLUDE_DIR}/gnuradio/audio - COMPONENT "audio_devel" ) diff --git a/gr-audio/lib/CMakeLists.txt b/gr-audio/lib/CMakeLists.txt index 944b1599b1..0534ddd86d 100644 --- a/gr-audio/lib/CMakeLists.txt +++ b/gr-audio/lib/CMakeLists.txt @@ -201,9 +201,9 @@ endif(WIN32) ######################################################################## add_library(gnuradio-audio SHARED ${gr_audio_sources}) target_link_libraries(gnuradio-audio ${gr_audio_libs}) -GR_LIBRARY_FOO(gnuradio-audio RUNTIME_COMPONENT "audio_runtime" DEVEL_COMPONENT "audio_devel") +GR_LIBRARY_FOO(gnuradio-audio) -install(FILES ${gr_audio_confs} DESTINATION ${GR_PREFSDIR} COMPONENT "audio_runtime") +install(FILES ${gr_audio_confs} DESTINATION ${GR_PREFSDIR}) if(ENABLE_STATIC_LIBS) if(ENABLE_GR_CTRLPORT) @@ -225,6 +225,6 @@ if(ENABLE_STATIC_LIBS) endif(NOT WIN32) install(TARGETS gnuradio-audio_static - ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT "audio_devel" # .lib file + ARCHIVE DESTINATION lib${LIB_SUFFIX} # .lib file ) endif(ENABLE_STATIC_LIBS) diff --git a/gr-audio/python/audio/CMakeLists.txt b/gr-audio/python/audio/CMakeLists.txt index 11409e4323..2edbf21cf4 100644 --- a/gr-audio/python/audio/CMakeLists.txt +++ b/gr-audio/python/audio/CMakeLists.txt @@ -24,7 +24,6 @@ GR_PYTHON_INSTALL( FILES __init__.py DESTINATION ${GR_PYTHON_DIR}/gnuradio/audio - COMPONENT "audio_python" ) ######################################################################## diff --git a/gr-audio/swig/CMakeLists.txt b/gr-audio/swig/CMakeLists.txt index f9dabfd8c4..4c67f5bd58 100644 --- a/gr-audio/swig/CMakeLists.txt +++ b/gr-audio/swig/CMakeLists.txt @@ -44,12 +44,10 @@ GR_SWIG_MAKE(audio_swig audio_swig.i) GR_SWIG_INSTALL( TARGETS audio_swig DESTINATION ${GR_PYTHON_DIR}/gnuradio/audio - COMPONENT "audio_python" ) install( FILES audio_swig.i ${CMAKE_CURRENT_BINARY_DIR}/audio_swig_doc.i DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig - COMPONENT "audio_swig" ) diff --git a/gr-blocks/CMakeLists.txt b/gr-blocks/CMakeLists.txt index 685f5736fb..6f573a09b1 100644 --- a/gr-blocks/CMakeLists.txt +++ b/gr-blocks/CMakeLists.txt @@ -44,40 +44,6 @@ GR_SET_GLOBAL(GR_BLOCKS_INCLUDE_DIRS if(ENABLE_GR_BLOCKS) ######################################################################## -# Setup CPack components -######################################################################## -include(GrPackage) -CPACK_SET(CPACK_COMPONENT_GROUP_BLOCKS_DESCRIPTION "GNU Radio Basic Blocks") - -CPACK_COMPONENT("blocks_runtime" - GROUP "Blocks" - DISPLAY_NAME "Runtime" - DESCRIPTION "Runtime" - DEPENDS "runtime_runtime" -) - -CPACK_COMPONENT("blocks_devel" - GROUP "Blocks" - DISPLAY_NAME "Development" - DESCRIPTION "C++ headers, package config, import libraries" - DEPENDS "runtime_devel" -) - -CPACK_COMPONENT("blocks_python" - GROUP "Blocks" - DISPLAY_NAME "Python" - DESCRIPTION "Python modules for runtime; GRC xml files" - DEPENDS "runtime_python;blocks_runtime" -) - -CPACK_COMPONENT("blocks_swig" - GROUP "Blocks" - DISPLAY_NAME "SWIG" - DESCRIPTION "SWIG development .i files" - DEPENDS "runtime_swig;blocks_python;blocks_devel" -) - -######################################################################## # Add subdirectories ######################################################################## add_subdirectory(include/gnuradio/blocks) @@ -105,7 +71,6 @@ configure_file( install( FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-blocks.pc DESTINATION ${GR_LIBRARY_DIR}/pkgconfig - COMPONENT "blocks_devel" ) endif(ENABLE_GR_BLOCKS) diff --git a/gr-blocks/examples/CMakeLists.txt b/gr-blocks/examples/CMakeLists.txt index 8be56d0b9d..850672e404 100644 --- a/gr-blocks/examples/CMakeLists.txt +++ b/gr-blocks/examples/CMakeLists.txt @@ -22,9 +22,8 @@ install( matrix_multiplexer.grc peak_detector2.grc vector_source_with_tags.grc - test_stream_mux_tags.grc + test_stream_mux_tags.grc DESTINATION ${GR_PKG_DATA_DIR}/examples/blocks - COMPONENT "runtime_python" ) add_subdirectory(metadata) diff --git a/gr-blocks/examples/ctrlport/CMakeLists.txt b/gr-blocks/examples/ctrlport/CMakeLists.txt index 23d2db129f..c9b39bcaaa 100644 --- a/gr-blocks/examples/ctrlport/CMakeLists.txt +++ b/gr-blocks/examples/ctrlport/CMakeLists.txt @@ -26,12 +26,10 @@ install( simple_copy.grc usrp_source_control.grc DESTINATION ${GR_PKG_DATA_DIR}/examples/ctrlport - COMPONENT "runtime_python" ) GR_PYTHON_INSTALL(PROGRAMS simple_copy_controller.py usrp_source_controller.py DESTINATION ${GR_PKG_DATA_DIR}/examples/ctrlport - COMPONENT "runtime_python" ) diff --git a/gr-blocks/examples/metadata/CMakeLists.txt b/gr-blocks/examples/metadata/CMakeLists.txt index 8d7bbe79e0..418b2d2594 100644 --- a/gr-blocks/examples/metadata/CMakeLists.txt +++ b/gr-blocks/examples/metadata/CMakeLists.txt @@ -26,5 +26,4 @@ install( file_metadata_vector_sink.grc file_metadata_vector_source.grc DESTINATION ${GR_PKG_DATA_DIR}/examples/metadata - COMPONENT "runtime_python" ) diff --git a/gr-blocks/examples/msg_passing/CMakeLists.txt b/gr-blocks/examples/msg_passing/CMakeLists.txt index 9c24355f7f..9965ce878a 100644 --- a/gr-blocks/examples/msg_passing/CMakeLists.txt +++ b/gr-blocks/examples/msg_passing/CMakeLists.txt @@ -23,5 +23,4 @@ install( FILES strobe.grc DESTINATION ${GR_PKG_DATA_DIR}/examples/msg_passing - COMPONENT "runtime_python" ) diff --git a/gr-blocks/examples/tags/CMakeLists.txt b/gr-blocks/examples/tags/CMakeLists.txt index 142b5cde6c..52cf4662bb 100644 --- a/gr-blocks/examples/tags/CMakeLists.txt +++ b/gr-blocks/examples/tags/CMakeLists.txt @@ -22,6 +22,4 @@ include(GrPython) GR_PYTHON_INSTALL(PROGRAMS test_file_tags.py DESTINATION ${GR_PKG_DATA_DIR}/examples/tags - COMPONENT "blocks_python" ) - diff --git a/gr-blocks/grc/CMakeLists.txt b/gr-blocks/grc/CMakeLists.txt index 96a715a7e4..2dd1481a47 100644 --- a/gr-blocks/grc/CMakeLists.txt +++ b/gr-blocks/grc/CMakeLists.txt @@ -28,4 +28,4 @@ if(NOT ENABLE_GR_CTRLPORT) ) endif(NOT ENABLE_GR_CTRLPORT) -install(FILES ${xml_files} DESTINATION ${GRC_BLOCKS_DIR} COMPONENT "blocks_python") +install(FILES ${xml_files} DESTINATION ${GRC_BLOCKS_DIR}) diff --git a/gr-blocks/include/gnuradio/blocks/CMakeLists.txt b/gr-blocks/include/gnuradio/blocks/CMakeLists.txt index 6b3eca69d3..5a748acc19 100644 --- a/gr-blocks/include/gnuradio/blocks/CMakeLists.txt +++ b/gr-blocks/include/gnuradio/blocks/CMakeLists.txt @@ -192,7 +192,6 @@ install(FILES wavfile_sink.h wavfile_source.h DESTINATION ${GR_INCLUDE_DIR}/gnuradio/blocks - COMPONENT "blocks_devel" ) if(ENABLE_GR_CTRLPORT) @@ -204,6 +203,5 @@ install(FILES ctrlport_probe2_i.h ctrlport_probe2_b.h DESTINATION ${GR_INCLUDE_DIR}/gnuradio/blocks - COMPONENT "blocks_devel" ) endif(ENABLE_GR_CTRLPORT) diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt index 1d69f27a1d..da6bc9bf89 100644 --- a/gr-blocks/lib/CMakeLists.txt +++ b/gr-blocks/lib/CMakeLists.txt @@ -259,7 +259,7 @@ add_library(gnuradio-blocks SHARED ${gr_blocks_sources}) add_dependencies(gnuradio-blocks blocks_generated_includes) target_link_libraries(gnuradio-blocks ${blocks_libs}) -GR_LIBRARY_FOO(gnuradio-blocks RUNTIME_COMPONENT "blocks_runtime" DEVEL_COMPONENT "blocks_devel") +GR_LIBRARY_FOO(gnuradio-blocks) if(ENABLE_STATIC_LIBS) # Remove controlport-specific source files from staticlibs build @@ -290,7 +290,7 @@ if(ENABLE_STATIC_LIBS) endif(NOT WIN32) install(TARGETS gnuradio-blocks_static - ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT "blocks_devel" # .lib file + ARCHIVE DESTINATION lib${LIB_SUFFIX} # .lib file ) endif(ENABLE_STATIC_LIBS) diff --git a/gr-blocks/python/blocks/CMakeLists.txt b/gr-blocks/python/blocks/CMakeLists.txt index 19d808b1dd..afb860a075 100644 --- a/gr-blocks/python/blocks/CMakeLists.txt +++ b/gr-blocks/python/blocks/CMakeLists.txt @@ -26,7 +26,6 @@ GR_PYTHON_INSTALL( parse_file_metadata.py stream_to_vector_decimator.py DESTINATION ${GR_PYTHON_DIR}/gnuradio/blocks - COMPONENT "blocks_python" ) ######################################################################## diff --git a/gr-blocks/python/grc_gnuradio/CMakeLists.txt b/gr-blocks/python/grc_gnuradio/CMakeLists.txt index 9ff1240997..33c7560ea6 100644 --- a/gr-blocks/python/grc_gnuradio/CMakeLists.txt +++ b/gr-blocks/python/grc_gnuradio/CMakeLists.txt @@ -24,7 +24,6 @@ include(GrPython) GR_PYTHON_INSTALL( FILES __init__.py DESTINATION ${GR_PYTHON_DIR}/grc_gnuradio - COMPONENT "blocks_python" ) GR_PYTHON_INSTALL(FILES @@ -33,5 +32,4 @@ GR_PYTHON_INSTALL(FILES blks2/selector.py blks2/tcp.py DESTINATION ${GR_PYTHON_DIR}/grc_gnuradio/blks2 - COMPONENT "blocks_python" ) diff --git a/gr-blocks/swig/CMakeLists.txt b/gr-blocks/swig/CMakeLists.txt index c128a9b26c..5aec00ae92 100644 --- a/gr-blocks/swig/CMakeLists.txt +++ b/gr-blocks/swig/CMakeLists.txt @@ -68,8 +68,7 @@ foreach(swigfile ${GR_SWIG_BLOCK_IFILES}) GR_SWIG_INSTALL( TARGETS ${swigfile} DESTINATION ${GR_PYTHON_DIR}/gnuradio/blocks - COMPONENT "blocks_python") - + ) list(APPEND SWIGFILES ${swigfile}.i) list(APPEND SWIGDOCFILES ${CMAKE_CURRENT_BINARY_DIR}/${swigfile}_doc.i) endforeach(swigfile) @@ -79,12 +78,10 @@ install( ${SWIGFILES} ${SWIGDOCFILES} DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig - COMPONENT "blocks_swig" ) # Install the Python file that pulls in the swig built files. GR_PYTHON_INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/blocks_swig.py DESTINATION ${GR_PYTHON_DIR}/gnuradio/blocks - COMPONENT "blocks_python" ) diff --git a/gr-channels/CMakeLists.txt b/gr-channels/CMakeLists.txt index 2b5b4cd7d5..9e5deeedcf 100644 --- a/gr-channels/CMakeLists.txt +++ b/gr-channels/CMakeLists.txt @@ -50,40 +50,6 @@ SET(GR_PKG_CHANNELS_EXAMPLES_DIR ${GR_PKG_DATA_DIR}/examples/channels) if(ENABLE_GR_CHANNELS) ######################################################################## -# Setup CPack components -######################################################################## -include(GrPackage) -CPACK_SET(CPACK_COMPONENT_GROUP_CHANNELS_DESCRIPTION "GNU Radio Channel Model Blocks") - -CPACK_COMPONENT("channels_runtime" - GROUP "Channel Models" - DISPLAY_NAME "Runtime" - DESCRIPTION "Runtime" - DEPENDS "runtime_runtime" -) - -CPACK_COMPONENT("channels_devel" - GROUP "Channel Models" - DISPLAY_NAME "Development" - DESCRIPTION "C++ headers, package config, import libraries" - DEPENDS "runtime_devel" -) - -CPACK_COMPONENT("channels_python" - GROUP "Channel Models" - DISPLAY_NAME "Python" - DESCRIPTION "Python modules for runtime; GRC xml files" - DEPENDS "runtime_python;channels_runtime" -) - -CPACK_COMPONENT("channels_swig" - GROUP "Channel Models" - DISPLAY_NAME "SWIG" - DESCRIPTION "SWIG development .i files" - DEPENDS "runtime_swig;channels_python;channels_devel" -) - -######################################################################## # Add subdirectories ######################################################################## add_subdirectory(include/gnuradio/channels) @@ -107,7 +73,6 @@ configure_file( install( FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-channels.pc DESTINATION ${GR_LIBRARY_DIR}/pkgconfig - COMPONENT "channels_devel" ) endif(ENABLE_GR_CHANNELS) diff --git a/gr-channels/examples/CMakeLists.txt b/gr-channels/examples/CMakeLists.txt index af33a8f66f..caf7677830 100644 --- a/gr-channels/examples/CMakeLists.txt +++ b/gr-channels/examples/CMakeLists.txt @@ -29,5 +29,4 @@ install( demo_qam.grc demo_ofdm.grc DESTINATION ${GR_PKG_CHANNELS_EXAMPLES_DIR} - COMPONENT "channels_python" ) diff --git a/gr-channels/grc/CMakeLists.txt b/gr-channels/grc/CMakeLists.txt index 75e2bc0ddd..c85170b4ea 100644 --- a/gr-channels/grc/CMakeLists.txt +++ b/gr-channels/grc/CMakeLists.txt @@ -19,5 +19,5 @@ file(GLOB xml_files "*.xml") install(FILES ${xml_files} - DESTINATION ${GRC_BLOCKS_DIR} COMPONENT "channels_python" + DESTINATION ${GRC_BLOCKS_DIR} ) diff --git a/gr-channels/include/gnuradio/channels/CMakeLists.txt b/gr-channels/include/gnuradio/channels/CMakeLists.txt index 6fac10e306..e41c7cc927 100644 --- a/gr-channels/include/gnuradio/channels/CMakeLists.txt +++ b/gr-channels/include/gnuradio/channels/CMakeLists.txt @@ -28,6 +28,5 @@ install(FILES selective_fading_model.h selective_fading_model2.h DESTINATION ${GR_INCLUDE_DIR}/gnuradio/channels - COMPONENT "channels_devel" ) diff --git a/gr-channels/lib/CMakeLists.txt b/gr-channels/lib/CMakeLists.txt index 34726c1715..d025889edb 100644 --- a/gr-channels/lib/CMakeLists.txt +++ b/gr-channels/lib/CMakeLists.txt @@ -77,7 +77,7 @@ list(APPEND channels_libs add_library(gnuradio-channels SHARED ${channels_sources}) target_link_libraries(gnuradio-channels ${channels_libs}) -GR_LIBRARY_FOO(gnuradio-channels RUNTIME_COMPONENT "channels_runtime" DEVEL_COMPONENT "channels_devel") +GR_LIBRARY_FOO(gnuradio-channels) add_dependencies(gnuradio-channels channels_generated_includes channels_generated_swigs gnuradio-runtime gnuradio-filter gnuradio-analog gnuradio-blocks) @@ -109,6 +109,6 @@ if(ENABLE_STATIC_LIBS) endif(NOT WIN32) install(TARGETS gnuradio-channels_static - ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT "channels_devel" # .lib file + ARCHIVE DESTINATION lib${LIB_SUFFIX} # .lib file ) endif(ENABLE_STATIC_LIBS) diff --git a/gr-channels/python/channels/CMakeLists.txt b/gr-channels/python/channels/CMakeLists.txt index 0e36b94a90..a91033df75 100644 --- a/gr-channels/python/channels/CMakeLists.txt +++ b/gr-channels/python/channels/CMakeLists.txt @@ -33,7 +33,6 @@ GR_PYTHON_INSTALL( phase_noise_gen.py quantizer.py DESTINATION ${GR_PYTHON_DIR}/gnuradio/channels - COMPONENT "channels_python" ) ######################################################################## diff --git a/gr-channels/swig/CMakeLists.txt b/gr-channels/swig/CMakeLists.txt index 3a85626e98..55b7ea7a47 100644 --- a/gr-channels/swig/CMakeLists.txt +++ b/gr-channels/swig/CMakeLists.txt @@ -44,7 +44,6 @@ GR_SWIG_MAKE(channels_swig channels_swig.i) GR_SWIG_INSTALL( TARGETS channels_swig DESTINATION ${GR_PYTHON_DIR}/gnuradio/channels - COMPONENT "channels_python" ) install( @@ -52,5 +51,4 @@ install( channels_swig.i ${CMAKE_CURRENT_BINARY_DIR}/channels_swig_doc.i DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig - COMPONENT "channels_swig" ) diff --git a/gr-comedi/CMakeLists.txt b/gr-comedi/CMakeLists.txt index caf46ee5e8..b457971264 100644 --- a/gr-comedi/CMakeLists.txt +++ b/gr-comedi/CMakeLists.txt @@ -51,40 +51,6 @@ SET(GR_PKG_COMEDI_EXAMPLES_DIR ${GR_PKG_DATA_DIR}/examples/comedi) if(ENABLE_GR_COMEDI) ######################################################################## -# Setup CPack components -######################################################################## -include(GrPackage) -CPACK_SET(CPACK_COMPONENT_GROUP_COMEDI_DESCRIPTION "GNU Radio Comedi Blocks") - -CPACK_COMPONENT("comedi_runtime" - GROUP "Comedi" - DISPLAY_NAME "Runtime" - DESCRIPTION "Dynamic link libraries" - DEPENDS "runtime_runtime" -) - -CPACK_COMPONENT("comedi_devel" - GROUP "Comedi" - DISPLAY_NAME "Development" - DESCRIPTION "C++ headers, package config, import libraries" - DEPENDS "runtime_devel" -) - -CPACK_COMPONENT("comedi_python" - GROUP "Comedi" - DISPLAY_NAME "Python" - DESCRIPTION "Python modules for runtime" - DEPENDS "runtime_python;comedi_runtime" -) - -CPACK_COMPONENT("comedi_swig" - GROUP "Comedi" - DISPLAY_NAME "SWIG" - DESCRIPTION "SWIG development .i files" - DEPENDS "runtime_swig;comedi_python;comedi_devel" -) - -######################################################################## # Add subdirectories ######################################################################## add_subdirectory(include/gnuradio/comedi) @@ -105,7 +71,6 @@ configure_file( install( FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-comedi.pc DESTINATION ${GR_LIBRARY_DIR}/pkgconfig - COMPONENT "comedi_devel" ) endif(ENABLE_GR_COMEDI) diff --git a/gr-comedi/include/gnuradio/comedi/CMakeLists.txt b/gr-comedi/include/gnuradio/comedi/CMakeLists.txt index 51a609e421..601c1fb91d 100644 --- a/gr-comedi/include/gnuradio/comedi/CMakeLists.txt +++ b/gr-comedi/include/gnuradio/comedi/CMakeLists.txt @@ -25,6 +25,5 @@ install(FILES sink_s.h source_s.h DESTINATION ${GR_INCLUDE_DIR}/gnuradio/comedi - COMPONENT "comedi_devel" ) diff --git a/gr-comedi/lib/CMakeLists.txt b/gr-comedi/lib/CMakeLists.txt index e6e58dc8c4..38f51fcd1b 100644 --- a/gr-comedi/lib/CMakeLists.txt +++ b/gr-comedi/lib/CMakeLists.txt @@ -54,7 +54,7 @@ list(APPEND comedi_libs add_library(gnuradio-comedi SHARED ${comedi_sources}) target_link_libraries(gnuradio-comedi ${comedi_libs}) -GR_LIBRARY_FOO(gnuradio-comedi RUNTIME_COMPONENT "comedi_runtime" DEVEL_COMPONENT "comedi_devel") +GR_LIBRARY_FOO(gnuradio-comedi) if(ENABLE_STATIC_LIBS) if(ENABLE_GR_CTRLPORT) @@ -76,6 +76,6 @@ if(ENABLE_STATIC_LIBS) endif(NOT WIN32) install(TARGETS gnuradio-comedi_static - ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT "comedi_devel" # .lib file + ARCHIVE DESTINATION lib${LIB_SUFFIX} # .lib file ) endif(ENABLE_STATIC_LIBS) diff --git a/gr-comedi/python/comedi/CMakeLists.txt b/gr-comedi/python/comedi/CMakeLists.txt index 5ac692f995..e3f7031a23 100644 --- a/gr-comedi/python/comedi/CMakeLists.txt +++ b/gr-comedi/python/comedi/CMakeLists.txt @@ -26,7 +26,6 @@ GR_PYTHON_INSTALL( FILES __init__.py DESTINATION ${GR_PYTHON_DIR}/gnuradio/comedi - COMPONENT "comedi_python" ) ######################################################################## diff --git a/gr-comedi/swig/CMakeLists.txt b/gr-comedi/swig/CMakeLists.txt index b31e4e87eb..d406a3002e 100644 --- a/gr-comedi/swig/CMakeLists.txt +++ b/gr-comedi/swig/CMakeLists.txt @@ -46,7 +46,6 @@ GR_SWIG_MAKE(comedi_swig comedi_swig.i) GR_SWIG_INSTALL( TARGETS comedi_swig DESTINATION ${GR_PYTHON_DIR}/gnuradio/comedi - COMPONENT "comedi_python" ) install( @@ -54,5 +53,4 @@ install( comedi_swig.i ${CMAKE_CURRENT_BINARY_DIR}/comedi_swig_doc.i DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig - COMPONENT "comedi_swig" ) diff --git a/gr-digital/CMakeLists.txt b/gr-digital/CMakeLists.txt index c6fa0798d1..cafadf68d1 100644 --- a/gr-digital/CMakeLists.txt +++ b/gr-digital/CMakeLists.txt @@ -55,40 +55,6 @@ SET(GR_PKG_DIGITAL_EXAMPLES_DIR ${GR_PKG_DATA_DIR}/examples/digital) if(ENABLE_GR_DIGITAL) ######################################################################## -# Setup CPack components -######################################################################## -include(GrPackage) -CPACK_SET(CPACK_COMPONENT_GROUP_DIGITAL_DESCRIPTION "GNU Radio Digital Blocks") - -CPACK_COMPONENT("digital_runtime" - GROUP "Digital" - DISPLAY_NAME "Runtime" - DESCRIPTION "Dynamic link libraries" - DEPENDS "runtime_runtime" -) - -CPACK_COMPONENT("digital_devel" - GROUP "Digital" - DISPLAY_NAME "Development" - DESCRIPTION "C++ headers, package config, import libraries" - DEPENDS "runtime_devel" -) - -CPACK_COMPONENT("digital_python" - GROUP "Digital" - DISPLAY_NAME "Python" - DESCRIPTION "Python modules for runtime" - DEPENDS "runtime_python;digital_runtime" -) - -CPACK_COMPONENT("digital_swig" - GROUP "Digital" - DISPLAY_NAME "SWIG" - DESCRIPTION "SWIG development .i files" - DEPENDS "runtime_swig;digital_python;digital_devel" -) - -######################################################################## # Add subdirectories ######################################################################## add_subdirectory(include/gnuradio/digital) @@ -113,7 +79,6 @@ configure_file( install( FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-digital.pc DESTINATION ${GR_LIBRARY_DIR}/pkgconfig - COMPONENT "digital_devel" ) endif(ENABLE_GR_DIGITAL) diff --git a/gr-digital/examples/CMakeLists.txt b/gr-digital/examples/CMakeLists.txt index 5f1adf08ab..7f388fceda 100644 --- a/gr-digital/examples/CMakeLists.txt +++ b/gr-digital/examples/CMakeLists.txt @@ -28,14 +28,12 @@ GR_PYTHON_INSTALL(PROGRAMS gen_whitener.py snr_estimators.py DESTINATION ${GR_PKG_DIGITAL_EXAMPLES_DIR} - COMPONENT "digital_python" ) install( FILES burst_shaper.grc DESTINATION ${GR_PKG_DIGITAL_EXAMPLES_DIR} - COMPONENT "digital_python" ) # Narrowband @@ -51,7 +49,6 @@ GR_PYTHON_INSTALL(PROGRAMS narrowband/digital_bert_tx.py narrowband/tunnel.py DESTINATION ${GR_PKG_DIGITAL_EXAMPLES_DIR}/narrowband - COMPONENT "digital_python" ) # OFDM @@ -65,7 +62,6 @@ GR_PYTHON_INSTALL(PROGRAMS ofdm/tunnel.py ofdm/uhd_interface.py DESTINATION ${GR_PKG_DIGITAL_EXAMPLES_DIR}/ofdm - COMPONENT "digital_python" ) install( @@ -74,7 +70,6 @@ install( ofdm/rx_ofdm.grc ofdm/ofdm_loopback.grc DESTINATION ${GR_PKG_DIGITAL_EXAMPLES_DIR}/ofdm - COMPONENT "digital_python" ) # DEMOD @@ -93,7 +88,6 @@ install( demod/uhd_corr_and_sync_tx.grc demod/uhd_corr_and_sync_rx.grc DESTINATION ${GR_PKG_DIGITAL_EXAMPLES_DIR}/demod - COMPONENT "digital_python" ) @@ -124,5 +118,4 @@ install( packet/uhd_packet_tx.grc packet/uhd_packet_tx_tun.grc DESTINATION ${GR_PKG_DIGITAL_EXAMPLES_DIR}/packet - COMPONENT "digital_python" ) diff --git a/gr-digital/grc/CMakeLists.txt b/gr-digital/grc/CMakeLists.txt index 9888247ca2..a3d0223290 100644 --- a/gr-digital/grc/CMakeLists.txt +++ b/gr-digital/grc/CMakeLists.txt @@ -19,5 +19,5 @@ file(GLOB xml_files "*.xml") install(FILES ${xml_files} - DESTINATION ${GRC_BLOCKS_DIR} COMPONENT "digital_python" + DESTINATION ${GRC_BLOCKS_DIR} ) diff --git a/gr-digital/include/gnuradio/digital/CMakeLists.txt b/gr-digital/include/gnuradio/digital/CMakeLists.txt index 1b22265853..4756d281f4 100644 --- a/gr-digital/include/gnuradio/digital/CMakeLists.txt +++ b/gr-digital/include/gnuradio/digital/CMakeLists.txt @@ -115,5 +115,4 @@ install(FILES simple_framer_sync.h header_payload_demux.h DESTINATION ${GR_INCLUDE_DIR}/gnuradio/digital - COMPONENT "digital_devel" ) diff --git a/gr-digital/lib/CMakeLists.txt b/gr-digital/lib/CMakeLists.txt index 84f53ec4f3..05160be9a5 100644 --- a/gr-digital/lib/CMakeLists.txt +++ b/gr-digital/lib/CMakeLists.txt @@ -156,7 +156,7 @@ list(APPEND digital_libs add_library(gnuradio-digital SHARED ${digital_sources}) target_link_libraries(gnuradio-digital ${digital_libs}) -GR_LIBRARY_FOO(gnuradio-digital RUNTIME_COMPONENT "digital_runtime" DEVEL_COMPONENT "digital_devel") +GR_LIBRARY_FOO(gnuradio-digital) add_dependencies( gnuradio-digital @@ -195,7 +195,7 @@ if(ENABLE_STATIC_LIBS) endif(NOT WIN32) install(TARGETS gnuradio-digital_static - ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT "digital_devel" # .lib file + ARCHIVE DESTINATION lib${LIB_SUFFIX} # .lib file ) endif(ENABLE_STATIC_LIBS) diff --git a/gr-digital/python/digital/CMakeLists.txt b/gr-digital/python/digital/CMakeLists.txt index 091bd883b3..8f88948a2e 100644 --- a/gr-digital/python/digital/CMakeLists.txt +++ b/gr-digital/python/digital/CMakeLists.txt @@ -51,7 +51,6 @@ GR_PYTHON_INSTALL( qpsk.py soft_dec_lut_gen.py DESTINATION ${GR_PYTHON_DIR}/gnuradio/digital - COMPONENT "digital_python" ) GR_PYTHON_INSTALL( @@ -62,7 +61,6 @@ GR_PYTHON_INSTALL( utils/alignment.py utils/tagged_streams.py DESTINATION ${GR_PYTHON_DIR}/gnuradio/digital/utils - COMPONENT "digital_python" ) ######################################################################## diff --git a/gr-digital/python/grc_gnuradio/CMakeLists.txt b/gr-digital/python/grc_gnuradio/CMakeLists.txt index f021299f1a..7284573775 100644 --- a/gr-digital/python/grc_gnuradio/CMakeLists.txt +++ b/gr-digital/python/grc_gnuradio/CMakeLists.txt @@ -26,5 +26,4 @@ include(GrPython) GR_PYTHON_INSTALL(FILES blks2/packet.py DESTINATION ${GR_PYTHON_DIR}/grc_gnuradio/blks2 - COMPONENT "digital_python" ) diff --git a/gr-digital/swig/CMakeLists.txt b/gr-digital/swig/CMakeLists.txt index 2f00dc14a3..0f1138ff30 100644 --- a/gr-digital/swig/CMakeLists.txt +++ b/gr-digital/swig/CMakeLists.txt @@ -55,7 +55,6 @@ GR_SWIG_MAKE(digital_swig digital_swig.i) GR_SWIG_INSTALL( TARGETS digital_swig DESTINATION ${GR_PYTHON_DIR}/gnuradio/digital - COMPONENT "digital_python" ) install( @@ -66,5 +65,4 @@ install( packet_header.i ${CMAKE_CURRENT_BINARY_DIR}/digital_swig_doc.i DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig - COMPONENT "digital_swig" ) diff --git a/gr-dtv/CMakeLists.txt b/gr-dtv/CMakeLists.txt index 5a23482b26..f045af5ef8 100644 --- a/gr-dtv/CMakeLists.txt +++ b/gr-dtv/CMakeLists.txt @@ -49,40 +49,6 @@ SET(GR_PKG_DTV_EXAMPLES_DIR ${GR_PKG_DATA_DIR}/examples/dtv) if(ENABLE_GR_DTV) ######################################################################## -# Setup CPack components -######################################################################## -include(GrPackage) -CPACK_SET(CPACK_COMPONENT_GROUP_DTV_DESCRIPTION "GNU Radio DTV Blocks") - -CPACK_COMPONENT("dtv_runtime" - GROUP "DTV" - DISPLAY_NAME "Runtime" - DESCRIPTION "Runtime" - DEPENDS "runtime_runtime" -) - -CPACK_COMPONENT("dtv_devel" - GROUP "DTV" - DISPLAY_NAME "Development" - DESCRIPTION "C++ headers, package config, import libraries" - DEPENDS "runtime_devel" -) - -CPACK_COMPONENT("dtv_python" - GROUP "DTV" - DISPLAY_NAME "Python" - DESCRIPTION "Python modules for runtime; GRC xml files" - DEPENDS "runtime_python;dtv_runtime" -) - -CPACK_COMPONENT("dtv_swig" - GROUP "DTV" - DISPLAY_NAME "SWIG" - DESCRIPTION "SWIG development .i files" - DEPENDS "runtime_swig;dtv_python;dtv_devel" -) - -######################################################################## # Add subdirectories ######################################################################## add_subdirectory(include/gnuradio/dtv) @@ -107,7 +73,6 @@ configure_file( install( FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-dtv.pc DESTINATION ${GR_LIBRARY_DIR}/pkgconfig - COMPONENT "dtv_devel" ) endif(ENABLE_GR_DTV) diff --git a/gr-dtv/apps/CMakeLists.txt b/gr-dtv/apps/CMakeLists.txt index f328234e3d..6de0ccec74 100644 --- a/gr-dtv/apps/CMakeLists.txt +++ b/gr-dtv/apps/CMakeLists.txt @@ -25,5 +25,4 @@ include(GrPython) GR_PYTHON_INSTALL( PROGRAMS DESTINATION ${GR_RUNTIME_DIR} - COMPONENT "dtv_python" ) diff --git a/gr-dtv/examples/CMakeLists.txt b/gr-dtv/examples/CMakeLists.txt index 8f209bce4f..884d1daafa 100644 --- a/gr-dtv/examples/CMakeLists.txt +++ b/gr-dtv/examples/CMakeLists.txt @@ -23,7 +23,6 @@ GR_PYTHON_INSTALL( PROGRAMS atsc_ctrlport_monitor.py DESTINATION ${GR_PKG_DTV_EXAMPLES_DIR} - COMPONENT "dtv_python" ) install( @@ -47,5 +46,4 @@ install( vv018-miso.grc catv_tx_64qam.grc DESTINATION ${GR_PKG_DTV_EXAMPLES_DIR} - COMPONENT "dtv_python" ) diff --git a/gr-dtv/grc/CMakeLists.txt b/gr-dtv/grc/CMakeLists.txt index a1386c5adf..e226d09976 100644 --- a/gr-dtv/grc/CMakeLists.txt +++ b/gr-dtv/grc/CMakeLists.txt @@ -74,5 +74,4 @@ install(FILES dtv_catv_frame_sync_enc_bb.xml dtv_catv_trellis_enc_bb.xml DESTINATION ${GRC_BLOCKS_DIR} - COMPONENT "dtv_python" ) diff --git a/gr-dtv/include/gnuradio/dtv/CMakeLists.txt b/gr-dtv/include/gnuradio/dtv/CMakeLists.txt index 620dd55879..ce15d99a3f 100644 --- a/gr-dtv/include/gnuradio/dtv/CMakeLists.txt +++ b/gr-dtv/include/gnuradio/dtv/CMakeLists.txt @@ -81,5 +81,4 @@ install(FILES catv_trellis_enc_bb.h DESTINATION ${GR_INCLUDE_DIR}/gnuradio/dtv - COMPONENT "dtv_devel" ) diff --git a/gr-dtv/lib/CMakeLists.txt b/gr-dtv/lib/CMakeLists.txt index 67b8a0ea48..7ffcc435de 100644 --- a/gr-dtv/lib/CMakeLists.txt +++ b/gr-dtv/lib/CMakeLists.txt @@ -116,7 +116,7 @@ list(APPEND dtv_libs include (CheckCCompilerFlag) if (MSVC) - # 64-bit MSVC always supports SSE2 + # 64-bit MSVC always supports SSE2 if (CMAKE_SIZEOF_VOID_P EQUAL 8) set(SSE2_SUPPORTED true) else () @@ -153,4 +153,4 @@ endif(MSVC) add_library(gnuradio-dtv SHARED ${dtv_sources}) target_link_libraries(gnuradio-dtv ${dtv_libs}) -GR_LIBRARY_FOO(gnuradio-dtv RUNTIME_COMPONENT "dtv_runtime" DEVEL_COMPONENT "dtv_devel") +GR_LIBRARY_FOO(gnuradio-dtv) diff --git a/gr-dtv/python/dtv/CMakeLists.txt b/gr-dtv/python/dtv/CMakeLists.txt index 543c2c14cf..e39b21cbb9 100644 --- a/gr-dtv/python/dtv/CMakeLists.txt +++ b/gr-dtv/python/dtv/CMakeLists.txt @@ -28,7 +28,6 @@ GR_PYTHON_INSTALL( atsc_rx.py atsc_rx_filter.py DESTINATION ${GR_PYTHON_DIR}/gnuradio/dtv - COMPONENT "dtv_python" ) ######################################################################## diff --git a/gr-dtv/swig/CMakeLists.txt b/gr-dtv/swig/CMakeLists.txt index 04b8b09ec7..7e98fa3b45 100644 --- a/gr-dtv/swig/CMakeLists.txt +++ b/gr-dtv/swig/CMakeLists.txt @@ -43,7 +43,6 @@ GR_SWIG_MAKE(dtv_swig dtv_swig.i) GR_SWIG_INSTALL( TARGETS dtv_swig DESTINATION ${GR_PYTHON_DIR}/gnuradio/dtv - COMPONENT "dtv_python" ) install( @@ -51,5 +50,4 @@ install( dtv_swig.i ${CMAKE_CURRENT_BINARY_DIR}/dtv_swig_doc.i DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig - COMPONENT "dtv_swig" ) diff --git a/gr-fec/CMakeLists.txt b/gr-fec/CMakeLists.txt index 338fe71864..c828fd92e7 100644 --- a/gr-fec/CMakeLists.txt +++ b/gr-fec/CMakeLists.txt @@ -52,40 +52,6 @@ SET(GR_PKG_FEC_EXAMPLES_DIR ${GR_PKG_DATA_DIR}/examples/fec) if(ENABLE_GR_FEC) ######################################################################## -# Setup CPack components -######################################################################## -include(GrPackage) -CPACK_SET(CPACK_COMPONENT_GROUP_FEC_DESCRIPTION "GNU Radio FEC Blocks") - -CPACK_COMPONENT("fec_runtime" - GROUP "FEC" - DISPLAY_NAME "Runtime" - DESCRIPTION "Runtime" - DEPENDS "runtime_runtime" -) - -CPACK_COMPONENT("fec_devel" - GROUP "FEC" - DISPLAY_NAME "Development" - DESCRIPTION "C++ headers, package config, import libraries" - DEPENDS "runtime_devel" -) - -CPACK_COMPONENT("fec_python" - GROUP "FEC" - DISPLAY_NAME "Python" - DESCRIPTION "Python modules for runtime; GRC xml files" - DEPENDS "runtime_python;fec_runtime" -) - -CPACK_COMPONENT("fec_swig" - GROUP "FEC" - DISPLAY_NAME "SWIG" - DESCRIPTION "SWIG development .i files" - DEPENDS "runtime_swig;fec_python;fec_devel" -) - -######################################################################## # Add subdirectories ######################################################################## add_subdirectory(include/gnuradio/fec) @@ -112,7 +78,6 @@ configure_file( install( FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-fec.pc DESTINATION ${GR_LIBRARY_DIR}/pkgconfig - COMPONENT "fec_devel" ) endif(ENABLE_GR_FEC) diff --git a/gr-fec/apps/CMakeLists.txt b/gr-fec/apps/CMakeLists.txt index 62fc6d26d4..41c6e4e2fc 100644 --- a/gr-fec/apps/CMakeLists.txt +++ b/gr-fec/apps/CMakeLists.txt @@ -32,11 +32,9 @@ # #INSTALL(TARGETS # DESTINATION ${GR_RUNTIME_DIR} -# COMPONENT "fec_devel" #) # #GR_PYTHON_INSTALL( # PROGRAMS # DESTINATION ${GR_RUNTIME_DIR} -# COMPONENT "fec_devel" #) diff --git a/gr-fec/examples/CMakeLists.txt b/gr-fec/examples/CMakeLists.txt index e1dfc4ebaf..a66df61ad0 100644 --- a/gr-fec/examples/CMakeLists.txt +++ b/gr-fec/examples/CMakeLists.txt @@ -40,5 +40,4 @@ install( polar_code_example.grc tpc_ber_curve_gen.grc DESTINATION ${GR_PKG_FEC_EXAMPLES_DIR} - COMPONENT "fec_python" ) diff --git a/gr-fec/grc/CMakeLists.txt b/gr-fec/grc/CMakeLists.txt index 27cb5af854..f61603df22 100644 --- a/gr-fec/grc/CMakeLists.txt +++ b/gr-fec/grc/CMakeLists.txt @@ -19,4 +19,8 @@ ######################################################################## file(GLOB xml_files "*.xml") -install(FILES ${xml_files} DESTINATION ${GRC_BLOCKS_DIR} COMPONENT "fec_python") + +install(FILES + ${xml_files} + DESTINATION ${GRC_BLOCKS_DIR} +) diff --git a/gr-fec/include/gnuradio/fec/CMakeLists.txt b/gr-fec/include/gnuradio/fec/CMakeLists.txt index 57594b47d8..5894b1d14a 100644 --- a/gr-fec/include/gnuradio/fec/CMakeLists.txt +++ b/gr-fec/include/gnuradio/fec/CMakeLists.txt @@ -60,8 +60,8 @@ install(FILES polar_decoder_sc_list.h polar_decoder_common.h polar_encoder_systematic.h - polar_decoder_sc_systematic.h DESTINATION ${GR_INCLUDE_DIR}/gnuradio/fec - COMPONENT "fec_devel" + polar_decoder_sc_systematic.h + DESTINATION ${GR_INCLUDE_DIR}/gnuradio/fec ) if(GSL_FOUND) @@ -73,6 +73,5 @@ if(GSL_FOUND) ldpc_par_mtrx_encoder.h ldpc_gen_mtrx_encoder.h DESTINATION ${GR_INCLUDE_DIR}/gnuradio/fec - COMPONENT "fec_devel" ) endif(GSL_FOUND) diff --git a/gr-fec/lib/CMakeLists.txt b/gr-fec/lib/CMakeLists.txt index bda98016b0..7ed38404f3 100644 --- a/gr-fec/lib/CMakeLists.txt +++ b/gr-fec/lib/CMakeLists.txt @@ -131,7 +131,7 @@ endif(GSL_FOUND) add_library(gnuradio-fec SHARED ${gnuradio_fec_sources}) target_link_libraries(gnuradio-fec ${gnuradio_fec_libs}) -GR_LIBRARY_FOO(gnuradio-fec RUNTIME_COMPONENT "fec_runtime" DEVEL_COMPONENT "fec_devel") +GR_LIBRARY_FOO(gnuradio-fec) if(ENABLE_STATIC_LIBS) if(ENABLE_GR_CTRLPORT) @@ -153,6 +153,6 @@ if(ENABLE_STATIC_LIBS) endif(NOT WIN32) install(TARGETS gnuradio-fec_static - ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT "fec_devel" # .lib file + ARCHIVE DESTINATION lib${LIB_SUFFIX} # .lib file ) endif(ENABLE_STATIC_LIBS) diff --git a/gr-fec/lib/reed-solomon/CMakeLists.txt b/gr-fec/lib/reed-solomon/CMakeLists.txt index 0858a670c5..3d35c9025d 100644 --- a/gr-fec/lib/reed-solomon/CMakeLists.txt +++ b/gr-fec/lib/reed-solomon/CMakeLists.txt @@ -46,7 +46,6 @@ list(APPEND gnuradio_fec_sources ${gr_fec_rs_sources}) #install( # FILES ${CMAKE_CURRENT_SOURCE_DIR}/rs.h # DESTINATION ${GR_INCLUDE_DIR}/gnuradio/fec -# COMPONENT "fec_devel" #) ######################################################################## diff --git a/gr-fec/lib/viterbi/CMakeLists.txt b/gr-fec/lib/viterbi/CMakeLists.txt index 3697787bcc..10c5940246 100644 --- a/gr-fec/lib/viterbi/CMakeLists.txt +++ b/gr-fec/lib/viterbi/CMakeLists.txt @@ -51,7 +51,6 @@ list(APPEND gnuradio_fec_sources ${viterbi_sources}) #install( # FILES ${CMAKE_CURRENT_SOURCE_DIR}/viterbi.h # DESTINATION ${GR_INCLUDE_DIR}/gnuradio/fec -# COMPONENT "fec_devel" #) ######################################################################## diff --git a/gr-fec/python/fec/CMakeLists.txt b/gr-fec/python/fec/CMakeLists.txt index 1b20004e6e..9d170b0423 100644 --- a/gr-fec/python/fec/CMakeLists.txt +++ b/gr-fec/python/fec/CMakeLists.txt @@ -36,7 +36,6 @@ GR_PYTHON_INSTALL( fec_test.py bercurve_generator.py DESTINATION ${GR_PYTHON_DIR}/gnuradio/fec - COMPONENT "fec_python" ) add_subdirectory(polar) diff --git a/gr-fec/python/fec/LDPC/CMakeLists.txt b/gr-fec/python/fec/LDPC/CMakeLists.txt index 3e56ef3975..d2022412b3 100644 --- a/gr-fec/python/fec/LDPC/CMakeLists.txt +++ b/gr-fec/python/fec/LDPC/CMakeLists.txt @@ -26,5 +26,4 @@ GR_PYTHON_INSTALL( Generate_LDPC_matrix_functions.py Generate_LDPC_matrix.py DESTINATION ${GR_PYTHON_DIR}/gnuradio/fec/LDPC - COMPONENT "fec_python" -)
\ No newline at end of file +) diff --git a/gr-fec/python/fec/polar/CMakeLists.txt b/gr-fec/python/fec/polar/CMakeLists.txt index a863995aff..1efed062ff 100644 --- a/gr-fec/python/fec/polar/CMakeLists.txt +++ b/gr-fec/python/fec/polar/CMakeLists.txt @@ -28,14 +28,10 @@ GR_PYTHON_INSTALL( channel_construction_bec.py helper_functions.py DESTINATION ${GR_PYTHON_DIR}/gnuradio/fec/polar - COMPONENT "fec_python" ) GR_PYTHON_INSTALL( PROGRAMS polar_channel_construction DESTINATION ${GR_RUNTIME_DIR} - COMPONENT "fec_python" ) - - diff --git a/gr-fec/swig/CMakeLists.txt b/gr-fec/swig/CMakeLists.txt index 443d365c98..5eaa5de748 100644 --- a/gr-fec/swig/CMakeLists.txt +++ b/gr-fec/swig/CMakeLists.txt @@ -48,7 +48,6 @@ GR_SWIG_MAKE(fec_swig fec_swig.i) GR_SWIG_INSTALL( TARGETS fec_swig DESTINATION ${GR_PYTHON_DIR}/gnuradio/fec - COMPONENT "fec_python" ) install( @@ -56,5 +55,4 @@ install( fec_swig.i ${CMAKE_CURRENT_BINARY_DIR}/fec_swig_doc.i DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig - COMPONENT "fec_swig" ) diff --git a/gr-fft/CMakeLists.txt b/gr-fft/CMakeLists.txt index 586abe56af..9ac6962c85 100644 --- a/gr-fft/CMakeLists.txt +++ b/gr-fft/CMakeLists.txt @@ -48,40 +48,6 @@ GR_SET_GLOBAL(GR_FFT_INCLUDE_DIRS if(ENABLE_GR_FFT) ######################################################################## -# Setup CPack components -######################################################################## -include(GrPackage) -CPACK_SET(CPACK_COMPONENT_GROUP_FFT_DESCRIPTION "GNU Radio FFT Blocks") - -CPACK_COMPONENT("fft_runtime" - GROUP "FFT" - DISPLAY_NAME "Runtime" - DESCRIPTION "Runtime" - DEPENDS "runtime_runtime" -) - -CPACK_COMPONENT("fft_devel" - GROUP "FFT" - DISPLAY_NAME "Development" - DESCRIPTION "C++ headers, package config, import libraries" - DEPENDS "runtime_devel" -) - -CPACK_COMPONENT("fft_python" - GROUP "FFT" - DISPLAY_NAME "Python" - DESCRIPTION "Python modules for runtime; GRC xml files" - DEPENDS "runtime_python;fft_runtime" -) - -CPACK_COMPONENT("fft_swig" - GROUP "FFT" - DISPLAY_NAME "SWIG" - DESCRIPTION "SWIG development .i files" - DEPENDS "runtime_swig;fft_python;fft_devel" -) - -######################################################################## # Add subdirectories ######################################################################## add_subdirectory(include/gnuradio/fft) @@ -105,7 +71,6 @@ configure_file( install( FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-fft.pc DESTINATION ${GR_LIBRARY_DIR}/pkgconfig - COMPONENT "fft_devel" ) endif(ENABLE_GR_FFT) diff --git a/gr-fft/grc/CMakeLists.txt b/gr-fft/grc/CMakeLists.txt index cc972dfa7e..8eeb431c3e 100644 --- a/gr-fft/grc/CMakeLists.txt +++ b/gr-fft/grc/CMakeLists.txt @@ -24,5 +24,4 @@ install(FILES fft_logpwrfft_x.xml fft_ctrlport_probe_psd.xml DESTINATION ${GRC_BLOCKS_DIR} - COMPONENT "fft_python" ) diff --git a/gr-fft/include/gnuradio/fft/CMakeLists.txt b/gr-fft/include/gnuradio/fft/CMakeLists.txt index 55705ee660..0f52b0aa96 100644 --- a/gr-fft/include/gnuradio/fft/CMakeLists.txt +++ b/gr-fft/include/gnuradio/fft/CMakeLists.txt @@ -29,14 +29,11 @@ install(FILES goertzel_fc.h window.h DESTINATION ${GR_INCLUDE_DIR}/gnuradio/fft - COMPONENT "fft_devel" ) if(ENABLE_GR_CTRLPORT) install(FILES ctrlport_probe_psd.h DESTINATION ${GR_INCLUDE_DIR}/gnuradio/fft - COMPONENT "fft_devel" ) endif(ENABLE_GR_CTRLPORT) - diff --git a/gr-fft/lib/CMakeLists.txt b/gr-fft/lib/CMakeLists.txt index 77476e58b4..9777d243df 100644 --- a/gr-fft/lib/CMakeLists.txt +++ b/gr-fft/lib/CMakeLists.txt @@ -83,7 +83,7 @@ endif() add_library(gnuradio-fft SHARED ${fft_sources}) target_link_libraries(gnuradio-fft ${fft_libs}) -GR_LIBRARY_FOO(gnuradio-fft RUNTIME_COMPONENT "fft_runtime" DEVEL_COMPONENT "fft_devel") +GR_LIBRARY_FOO(gnuradio-fft) if(ENABLE_STATIC_LIBS) if(ENABLE_GR_CTRLPORT) @@ -105,6 +105,6 @@ if(ENABLE_STATIC_LIBS) endif(NOT WIN32) install(TARGETS gnuradio-fft_static - ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT "fft_devel" # .lib file + ARCHIVE DESTINATION lib${LIB_SUFFIX} # .lib file ) endif(ENABLE_STATIC_LIBS) diff --git a/gr-fft/python/fft/CMakeLists.txt b/gr-fft/python/fft/CMakeLists.txt index b5a8c9d4f7..016c76d27d 100644 --- a/gr-fft/python/fft/CMakeLists.txt +++ b/gr-fft/python/fft/CMakeLists.txt @@ -25,7 +25,6 @@ GR_PYTHON_INSTALL( __init__.py logpwrfft.py DESTINATION ${GR_PYTHON_DIR}/gnuradio/fft - COMPONENT "fft_python" ) ######################################################################## diff --git a/gr-fft/swig/CMakeLists.txt b/gr-fft/swig/CMakeLists.txt index 74a4a25b10..67e34bbba8 100644 --- a/gr-fft/swig/CMakeLists.txt +++ b/gr-fft/swig/CMakeLists.txt @@ -44,7 +44,6 @@ GR_SWIG_MAKE(fft_swig fft_swig.i) GR_SWIG_INSTALL( TARGETS fft_swig DESTINATION ${GR_PYTHON_DIR}/gnuradio/fft - COMPONENT "fft_python" ) install( @@ -52,5 +51,4 @@ install( fft_swig.i ${CMAKE_CURRENT_BINARY_DIR}/fft_swig_doc.i DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig - COMPONENT "fft_swig" ) diff --git a/gr-filter/CMakeLists.txt b/gr-filter/CMakeLists.txt index c0d46d521a..972cd2c8b0 100644 --- a/gr-filter/CMakeLists.txt +++ b/gr-filter/CMakeLists.txt @@ -51,40 +51,6 @@ SET(GR_PKG_FILTER_EXAMPLES_DIR ${GR_PKG_DATA_DIR}/examples/filter) if(ENABLE_GR_FILTER) ######################################################################## -# Setup CPack components -######################################################################## -include(GrPackage) -CPACK_SET(CPACK_COMPONENT_GROUP_FILTER_DESCRIPTION "GNU Radio Filter Blocks") - -CPACK_COMPONENT("filter_runtime" - GROUP "Filter" - DISPLAY_NAME "Runtime" - DESCRIPTION "Runtime" - DEPENDS "runtime_runtime" -) - -CPACK_COMPONENT("filter_devel" - GROUP "Filter" - DISPLAY_NAME "Development" - DESCRIPTION "C++ headers, package config, import libraries" - DEPENDS "runtime_devel" -) - -CPACK_COMPONENT("filter_python" - GROUP "Filter" - DISPLAY_NAME "Python" - DESCRIPTION "Python modules for runtime; GRC xml files" - DEPENDS "runtime_python;filter_runtime" -) - -CPACK_COMPONENT("filter_swig" - GROUP "Filter" - DISPLAY_NAME "SWIG" - DESCRIPTION "SWIG development .i files" - DEPENDS "runtime_swig;filter_python;filter_devel" -) - -######################################################################## # Add subdirectories ######################################################################## add_subdirectory(include/gnuradio/filter) @@ -111,7 +77,6 @@ configure_file( install( FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-filter.pc DESTINATION ${GR_LIBRARY_DIR}/pkgconfig - COMPONENT "filter_devel" ) endif(ENABLE_GR_FILTER) diff --git a/gr-filter/apps/CMakeLists.txt b/gr-filter/apps/CMakeLists.txt index 61e2f183ad..8df2c025c6 100644 --- a/gr-filter/apps/CMakeLists.txt +++ b/gr-filter/apps/CMakeLists.txt @@ -26,5 +26,4 @@ GR_PYTHON_INSTALL( PROGRAMS gr_filter_design DESTINATION ${GR_RUNTIME_DIR} - COMPONENT "filter_python" ) diff --git a/gr-filter/examples/CMakeLists.txt b/gr-filter/examples/CMakeLists.txt index a6229f38f4..c7410a839c 100644 --- a/gr-filter/examples/CMakeLists.txt +++ b/gr-filter/examples/CMakeLists.txt @@ -37,7 +37,6 @@ GR_PYTHON_INSTALL(PROGRAMS gr_filtdes_restrict.py gr_filtdes_live_upd.py DESTINATION ${GR_PKG_FILTER_EXAMPLES_DIR} - COMPONENT "filter_python" ) install( @@ -45,5 +44,4 @@ install( filter_taps.grc resampler_demo.grc DESTINATION ${GR_PKG_FILTER_EXAMPLES_DIR} - COMPONENT "filter_python" ) diff --git a/gr-filter/grc/CMakeLists.txt b/gr-filter/grc/CMakeLists.txt index b3bc2e1828..6c67a5a6ae 100644 --- a/gr-filter/grc/CMakeLists.txt +++ b/gr-filter/grc/CMakeLists.txt @@ -51,5 +51,4 @@ install(FILES variable_band_reject_filter_taps.xml variable_rrc_filter_taps.xml DESTINATION ${GRC_BLOCKS_DIR} - COMPONENT "filter_python" ) diff --git a/gr-filter/include/gnuradio/filter/CMakeLists.txt b/gr-filter/include/gnuradio/filter/CMakeLists.txt index e75f02b7a2..7ad692743a 100644 --- a/gr-filter/include/gnuradio/filter/CMakeLists.txt +++ b/gr-filter/include/gnuradio/filter/CMakeLists.txt @@ -76,6 +76,5 @@ install(FILES single_pole_iir_filter_cc.h single_pole_iir_filter_ff.h DESTINATION ${GR_INCLUDE_DIR}/gnuradio/filter - COMPONENT "filter_devel" ) diff --git a/gr-filter/lib/CMakeLists.txt b/gr-filter/lib/CMakeLists.txt index feabe73be7..ff869eafe5 100644 --- a/gr-filter/lib/CMakeLists.txt +++ b/gr-filter/lib/CMakeLists.txt @@ -119,7 +119,7 @@ list(APPEND filter_libs add_library(gnuradio-filter SHARED ${filter_sources}) target_link_libraries(gnuradio-filter ${filter_libs}) -GR_LIBRARY_FOO(gnuradio-filter RUNTIME_COMPONENT "filter_runtime" DEVEL_COMPONENT "filter_devel") +GR_LIBRARY_FOO(gnuradio-filter) add_dependencies(gnuradio-filter filter_generated_includes filter_generated_swigs gnuradio-runtime gnuradio-fft) @@ -148,7 +148,7 @@ if(ENABLE_STATIC_LIBS) endif(NOT WIN32) install(TARGETS gnuradio-filter_static - ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT "filter_devel" # .lib file + ARCHIVE DESTINATION lib${LIB_SUFFIX} # .lib file ) endif(ENABLE_STATIC_LIBS) diff --git a/gr-filter/python/filter/CMakeLists.txt b/gr-filter/python/filter/CMakeLists.txt index 1dd055abaf..bc4892412e 100644 --- a/gr-filter/python/filter/CMakeLists.txt +++ b/gr-filter/python/filter/CMakeLists.txt @@ -29,7 +29,6 @@ GR_PYTHON_INSTALL( pfb.py rational_resampler.py DESTINATION ${GR_PYTHON_DIR}/gnuradio/filter - COMPONENT "filter_python" ) ######################################################################## diff --git a/gr-filter/python/filter/design/CMakeLists.txt b/gr-filter/python/filter/design/CMakeLists.txt index 21e47b86d6..2c800e9148 100644 --- a/gr-filter/python/filter/design/CMakeLists.txt +++ b/gr-filter/python/filter/design/CMakeLists.txt @@ -26,6 +26,5 @@ GR_PYTHON_INSTALL( filter_design.py fir_design.py DESTINATION ${GR_PYTHON_DIR}/gnuradio/filter - COMPONENT "filter_python" ) diff --git a/gr-filter/python/filter/gui/CMakeLists.txt b/gr-filter/python/filter/gui/CMakeLists.txt index 6c9bbfa2f3..6c1d98894f 100644 --- a/gr-filter/python/filter/gui/CMakeLists.txt +++ b/gr-filter/python/filter/gui/CMakeLists.txt @@ -29,6 +29,5 @@ GR_PYTHON_INSTALL( polezero_plot.py pyqt_filter_stacked.py DESTINATION ${GR_PYTHON_DIR}/gnuradio/filter - COMPONENT "filter_python" ) diff --git a/gr-filter/swig/CMakeLists.txt b/gr-filter/swig/CMakeLists.txt index b7bf203d16..ee8389dddb 100644 --- a/gr-filter/swig/CMakeLists.txt +++ b/gr-filter/swig/CMakeLists.txt @@ -50,7 +50,6 @@ GR_SWIG_MAKE(filter_swig filter_swig.i) GR_SWIG_INSTALL( TARGETS filter_swig DESTINATION ${GR_PYTHON_DIR}/gnuradio/filter - COMPONENT "filter_python" ) install( @@ -58,5 +57,4 @@ install( filter_swig.i ${CMAKE_CURRENT_BINARY_DIR}/gr_filter_swig_doc.i DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig - COMPONENT "filter_swig" ) diff --git a/gr-qtgui/CMakeLists.txt b/gr-qtgui/CMakeLists.txt index ad10363c1e..80bb8b3bdb 100644 --- a/gr-qtgui/CMakeLists.txt +++ b/gr-qtgui/CMakeLists.txt @@ -70,40 +70,6 @@ if(ENABLE_GR_QTGUI) include(GrSetupQt4) ######################################################################## -# Setup CPack components -######################################################################## -include(GrPackage) -CPACK_SET(CPACK_COMPONENT_GROUP_QTGUI_DESCRIPTION "GNU Radio QtGUI Blocks") - -CPACK_COMPONENT("qtgui_runtime" - GROUP "QtGUI" - DISPLAY_NAME "Runtime" - DESCRIPTION "Runtime" - DEPENDS "runtime_runtime" -) - -CPACK_COMPONENT("qtgui_devel" - GROUP "QtGUI" - DISPLAY_NAME "Development" - DESCRIPTION "C++ headers, package config, import libraries" - DEPENDS "runtime_devel" -) - -CPACK_COMPONENT("qtgui_python" - GROUP "QtGUI" - DISPLAY_NAME "Python" - DESCRIPTION "Python modules for runtime; GRC xml files" - DEPENDS "runtime_python;qtgui_runtime" -) - -CPACK_COMPONENT("qtgui_swig" - GROUP "QtGUI" - DISPLAY_NAME "SWIG" - DESCRIPTION "SWIG development .i files" - DEPENDS "runtime_swig;qtgui_python;qtgui_devel" -) - -######################################################################## # Add subdirectories ######################################################################## add_subdirectory(include/gnuradio/qtgui) @@ -129,7 +95,6 @@ configure_file( install( FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-qtgui.pc DESTINATION ${GR_LIBRARY_DIR}/pkgconfig - COMPONENT "qtgui_devel" ) ######################################################################## @@ -138,7 +103,6 @@ install( install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/gr-qtgui.conf DESTINATION ${GR_PREFSDIR} - COMPONENT "qtgui" ) @@ -152,7 +116,6 @@ install( themes/alt.qss themes/projector.qss DESTINATION ${GR_THEMES_DIR} - COMPONENT "qtgui" ) endif(ENABLE_GR_QTGUI) diff --git a/gr-qtgui/apps/CMakeLists.txt b/gr-qtgui/apps/CMakeLists.txt index 3c64cb6e0a..6a8e6c51aa 100644 --- a/gr-qtgui/apps/CMakeLists.txt +++ b/gr-qtgui/apps/CMakeLists.txt @@ -33,7 +33,6 @@ GR_PYTHON_INSTALL( plot_time_form.py plot_time_raster_form.py DESTINATION ${GR_PYTHON_DIR}/gnuradio/qtgui - COMPONENT "qtgui_python" ) GR_PYTHON_INSTALL( @@ -58,5 +57,4 @@ GR_PYTHON_INSTALL( gr_spectrogram_plot gr_constellation_plot DESTINATION ${GR_RUNTIME_DIR} - COMPONENT "qtgui_python" ) diff --git a/gr-qtgui/examples/CMakeLists.txt b/gr-qtgui/examples/CMakeLists.txt index 5662dfa9c8..a91e374772 100644 --- a/gr-qtgui/examples/CMakeLists.txt +++ b/gr-qtgui/examples/CMakeLists.txt @@ -33,7 +33,6 @@ GR_PYTHON_INSTALL(PROGRAMS pyqt_waterfall_c.py pyqt_waterfall_f.py DESTINATION ${GR_PKG_QTGUI_EXAMPLES_DIR} - COMPONENT "qtgui_python" ) install( @@ -43,5 +42,4 @@ install( qtgui_message_inputs.grc test_qtgui_msg.grc DESTINATION ${GR_PKG_QTGUI_EXAMPLES_DIR} - COMPONENT "qtgui_python" ) diff --git a/gr-qtgui/examples/c++/CMakeLists.txt b/gr-qtgui/examples/c++/CMakeLists.txt index ad84287367..f7c61bc316 100644 --- a/gr-qtgui/examples/c++/CMakeLists.txt +++ b/gr-qtgui/examples/c++/CMakeLists.txt @@ -45,5 +45,4 @@ target_link_libraries(display_qt ${QTGUI_LIBRARIES}) INSTALL(TARGETS display_qt DESTINATION ${GR_PKG_QTGUI_EXAMPLES_DIR} - COMPONENT "qtgui_examples" ) diff --git a/gr-qtgui/grc/CMakeLists.txt b/gr-qtgui/grc/CMakeLists.txt index d56158ac70..7da5fbc352 100644 --- a/gr-qtgui/grc/CMakeLists.txt +++ b/gr-qtgui/grc/CMakeLists.txt @@ -19,4 +19,4 @@ ######################################################################## file(GLOB xml_files "*.xml") -install(FILES ${xml_files} DESTINATION ${GRC_BLOCKS_DIR} COMPONENT "qtgui_python") +install(FILES ${xml_files} DESTINATION ${GRC_BLOCKS_DIR}) diff --git a/gr-qtgui/include/gnuradio/qtgui/CMakeLists.txt b/gr-qtgui/include/gnuradio/qtgui/CMakeLists.txt index 991c7583a8..92ffef9ee7 100644 --- a/gr-qtgui/include/gnuradio/qtgui/CMakeLists.txt +++ b/gr-qtgui/include/gnuradio/qtgui/CMakeLists.txt @@ -68,5 +68,4 @@ install(FILES VectorDisplayPlot.h vector_sink_f.h DESTINATION ${GR_INCLUDE_DIR}/gnuradio/qtgui - COMPONENT "qtgui_devel" ) diff --git a/gr-qtgui/lib/CMakeLists.txt b/gr-qtgui/lib/CMakeLists.txt index b1ee580398..aafb61699d 100644 --- a/gr-qtgui/lib/CMakeLists.txt +++ b/gr-qtgui/lib/CMakeLists.txt @@ -177,7 +177,7 @@ endif(ENABLE_PYTHON) add_definitions(-DQWT_DLL) #setup QWT library linkage add_library(gnuradio-qtgui SHARED ${qtgui_sources}) target_link_libraries(gnuradio-qtgui ${qtgui_libs}) -GR_LIBRARY_FOO(gnuradio-qtgui RUNTIME_COMPONENT "qtgui_runtime" DEVEL_COMPONENT "qtgui_devel") +GR_LIBRARY_FOO(gnuradio-qtgui) if(ENABLE_STATIC_LIBS) if(ENABLE_GR_CTRLPORT) @@ -199,6 +199,6 @@ if(ENABLE_STATIC_LIBS) endif(NOT WIN32) install(TARGETS gnuradio-qtgui_static - ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT "qtgui_devel" # .lib file + ARCHIVE DESTINATION lib${LIB_SUFFIX} # .lib file ) endif(ENABLE_STATIC_LIBS) diff --git a/gr-qtgui/python/qtgui/CMakeLists.txt b/gr-qtgui/python/qtgui/CMakeLists.txt index 4fa4d0f484..212c98ebb4 100644 --- a/gr-qtgui/python/qtgui/CMakeLists.txt +++ b/gr-qtgui/python/qtgui/CMakeLists.txt @@ -24,7 +24,6 @@ GR_PYTHON_INSTALL( FILES __init__.py range.py DESTINATION ${GR_PYTHON_DIR}/gnuradio/qtgui - COMPONENT "qtgui_python" ) ######################################################################## diff --git a/gr-qtgui/swig/CMakeLists.txt b/gr-qtgui/swig/CMakeLists.txt index 44b5c2fbd4..2990ac9086 100644 --- a/gr-qtgui/swig/CMakeLists.txt +++ b/gr-qtgui/swig/CMakeLists.txt @@ -51,12 +51,10 @@ GR_SWIG_MAKE(qtgui_swig qtgui_swig.i) GR_SWIG_INSTALL( TARGETS qtgui_swig DESTINATION ${GR_PYTHON_DIR}/gnuradio/qtgui - COMPONENT "qtgui_python" ) install(FILES qtgui_swig.i ${CMAKE_CURRENT_BINARY_DIR}/qtgui_swig_doc.i DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig - COMPONENT "qtgui_swig" ) diff --git a/gr-trellis/CMakeLists.txt b/gr-trellis/CMakeLists.txt index a3f0ad486c..20c1c6b54d 100644 --- a/gr-trellis/CMakeLists.txt +++ b/gr-trellis/CMakeLists.txt @@ -51,53 +51,6 @@ SET(GR_PKG_TRELLIS_EXAMPLES_DIR ${GR_PKG_DATA_DIR}/examples/trellis) if(ENABLE_GR_TRELLIS) ######################################################################## -# Setup CPack components -######################################################################## -include(GrPackage) -CPACK_SET(CPACK_COMPONENT_GROUP_TRELLIS_DESCRIPTION "GNU Radio Trellis Blocks") - -CPACK_COMPONENT("trellis_docs" - GROUP "Trellis" - DISPLAY_NAME "Documentation" - DESCRIPTION "Doxygen HTML and XML" -) - -CPACK_COMPONENT("trellis_runtime" - GROUP "Trellis" - DISPLAY_NAME "Runtime" - DESCRIPTION "Dynamic link libraries" - DEPENDS "runtime_runtime" -) - -CPACK_COMPONENT("trellis_devel" - GROUP "Trellis" - DISPLAY_NAME "Development" - DESCRIPTION "C++ headers, package config, import libraries" - DEPENDS "runtime_devel" -) - -CPACK_COMPONENT("trellis_python" - GROUP "Trellis" - DISPLAY_NAME "Python" - DESCRIPTION "Python modules for runtime" - DEPENDS "runtime_python;trellis_runtime" -) - -CPACK_COMPONENT("trellis_examples" - GROUP "Trellis" - DISPLAY_NAME "Examples" - DESCRIPTION "Python examples for trellis" - DEPENDS "trellis_python" -) - -CPACK_COMPONENT("trellis_swig" - GROUP "Trellis" - DISPLAY_NAME "SWIG" - DESCRIPTION "SWIG development .i files" - DEPENDS "runtime_swig;trellis_python;trellis_devel" -) - -######################################################################## # Add subdirectories ######################################################################## add_subdirectory(include/gnuradio/trellis) @@ -122,7 +75,6 @@ configure_file( install( FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-trellis.pc DESTINATION ${GR_LIBRARY_DIR}/pkgconfig - COMPONENT "trellis_devel" ) endif(ENABLE_GR_TRELLIS) diff --git a/gr-trellis/doc/CMakeLists.txt b/gr-trellis/doc/CMakeLists.txt index 568539582d..06813258f3 100644 --- a/gr-trellis/doc/CMakeLists.txt +++ b/gr-trellis/doc/CMakeLists.txt @@ -35,7 +35,6 @@ add_custom_target(gr_trellis_html ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/gr-tre install( FILES ${CMAKE_CURRENT_BINARY_DIR}/gr-trellis.html DESTINATION ${GR_PKG_DOC_DIR}/html - COMPONENT "trellis_docs" ) endif(XMLTO_EXECUTABLE) @@ -69,5 +68,4 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/test_tcm.py.xml ${CMAKE_CURRENT_BINARY_DIR}/test_viterbi_equalization1.py.xml DESTINATION ${GR_PKG_DOC_DIR}/xml - COMPONENT "trellis_docs" ) diff --git a/gr-trellis/examples/grc/CMakeLists.txt b/gr-trellis/examples/grc/CMakeLists.txt index c5d4fc8965..a4718dd59b 100644 --- a/gr-trellis/examples/grc/CMakeLists.txt +++ b/gr-trellis/examples/grc/CMakeLists.txt @@ -59,5 +59,4 @@ install( ${CMAKE_CURRENT_BINARY_DIR}/interference_cancellation.grc readme.txt DESTINATION ${GR_PKG_TRELLIS_EXAMPLES_DIR} - COMPONENT "trellis-examples" ) diff --git a/gr-trellis/examples/python/CMakeLists.txt b/gr-trellis/examples/python/CMakeLists.txt index 8a05525bc4..76c88ee2f4 100644 --- a/gr-trellis/examples/python/CMakeLists.txt +++ b/gr-trellis/examples/python/CMakeLists.txt @@ -24,13 +24,11 @@ GR_PYTHON_INSTALL( test_tcm.py test_cpm.py DESTINATION ${GR_PKG_TRELLIS_EXAMPLES_DIR} - COMPONENT "trellis_examples" ) install( FILES README DESTINATION ${GR_PKG_DATA_DIR}/examples/trellis - COMPONENT "trellis_examples" ) install( @@ -68,5 +66,4 @@ install( fsm_files/simple.fsm fsm_files/uncoded4.fsm DESTINATION ${GR_PKG_TRELLIS_EXAMPLES_DIR}/fsm_files - COMPONENT "trellis_examples" ) diff --git a/gr-trellis/grc/CMakeLists.txt b/gr-trellis/grc/CMakeLists.txt index d60d64872c..9fbadd50d8 100644 --- a/gr-trellis/grc/CMakeLists.txt +++ b/gr-trellis/grc/CMakeLists.txt @@ -32,5 +32,4 @@ install(FILES trellis_pccc_decoder_x.xml trellis_pccc_decoder_combined_xx.xml DESTINATION ${GRC_BLOCKS_DIR} - COMPONENT "trellis_python" ) diff --git a/gr-trellis/include/gnuradio/trellis/CMakeLists.txt b/gr-trellis/include/gnuradio/trellis/CMakeLists.txt index ef60ce7370..831f2916dc 100644 --- a/gr-trellis/include/gnuradio/trellis/CMakeLists.txt +++ b/gr-trellis/include/gnuradio/trellis/CMakeLists.txt @@ -54,6 +54,5 @@ install(FILES siso_combined_f.h siso_f.h DESTINATION ${GR_INCLUDE_DIR}/gnuradio/trellis - COMPONENT "trellis_devel" ) diff --git a/gr-trellis/lib/CMakeLists.txt b/gr-trellis/lib/CMakeLists.txt index 9c51d06604..3d268c608f 100644 --- a/gr-trellis/lib/CMakeLists.txt +++ b/gr-trellis/lib/CMakeLists.txt @@ -90,7 +90,7 @@ ENDIF(MSVC) add_library(gnuradio-trellis SHARED ${trellis_sources}) target_link_libraries(gnuradio-trellis ${trellis_libs}) -GR_LIBRARY_FOO(gnuradio-trellis RUNTIME_COMPONENT "trellis_runtime" DEVEL_COMPONENT "trellis_devel") +GR_LIBRARY_FOO(gnuradio-trellis) add_dependencies(gnuradio-trellis trellis_generated_includes trellis_generated_swigs gnuradio-runtime gnuradio-digital) @@ -120,6 +120,6 @@ if(ENABLE_STATIC_LIBS) endif(NOT WIN32) install(TARGETS gnuradio-trellis_static - ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT "trellis_devel" # .lib file + ARCHIVE DESTINATION lib${LIB_SUFFIX} # .lib file ) endif(ENABLE_STATIC_LIBS) diff --git a/gr-trellis/python/trellis/CMakeLists.txt b/gr-trellis/python/trellis/CMakeLists.txt index 5cfe927412..10fd9d5c0e 100644 --- a/gr-trellis/python/trellis/CMakeLists.txt +++ b/gr-trellis/python/trellis/CMakeLists.txt @@ -27,7 +27,6 @@ GR_PYTHON_INSTALL( __init__.py fsm_utils.py DESTINATION ${GR_PYTHON_DIR}/gnuradio/trellis - COMPONENT "trellis_python" ) ######################################################################## diff --git a/gr-trellis/swig/CMakeLists.txt b/gr-trellis/swig/CMakeLists.txt index d03d0998ef..e1ee66cba0 100644 --- a/gr-trellis/swig/CMakeLists.txt +++ b/gr-trellis/swig/CMakeLists.txt @@ -50,7 +50,6 @@ GR_SWIG_MAKE(trellis_swig trellis_swig.i) GR_SWIG_INSTALL( TARGETS trellis_swig DESTINATION ${GR_PYTHON_DIR}/gnuradio/trellis - COMPONENT "trellis_python" ) install( @@ -58,5 +57,4 @@ install( trellis_swig.i ${CMAKE_CURRENT_BINARY_DIR}/trellis_swig_doc.i DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig - COMPONENT "trellis_swig" ) diff --git a/gr-uhd/CMakeLists.txt b/gr-uhd/CMakeLists.txt index 43ac4ab8a9..6310822cf4 100644 --- a/gr-uhd/CMakeLists.txt +++ b/gr-uhd/CMakeLists.txt @@ -50,47 +50,6 @@ SET(GR_PKG_UHD_EXAMPLES_DIR ${GR_PKG_DATA_DIR}/examples/uhd) if(ENABLE_GR_UHD) ######################################################################## -# Setup CPack components -######################################################################## -include(GrPackage) -CPACK_SET(CPACK_COMPONENT_GROUP_UHD_DESCRIPTION "GNU Radio UHD Blocks") - -CPACK_COMPONENT("uhd_runtime" - GROUP "UHD" - DISPLAY_NAME "Runtime" - DESCRIPTION "Runtime" - DEPENDS "runtime_runtime" -) - -CPACK_COMPONENT("uhd_devel" - GROUP "UHD" - DISPLAY_NAME "Development" - DESCRIPTION "C++ headers, package config, import libraries" - DEPENDS "runtime_devel" -) - -CPACK_COMPONENT("uhd_python" - GROUP "UHD" - DISPLAY_NAME "Python" - DESCRIPTION "Python modules for runtime; GRC xml files" - DEPENDS "runtime_python;uhd_runtime" -) - -CPACK_COMPONENT("uhd_examples" - GROUP "UHD" - DISPLAY_NAME "Examples" - DESCRIPTION "Example programs" - DEPENDS "uhd_runtime" -) - -CPACK_COMPONENT("uhd_swig" - GROUP "UHD" - DISPLAY_NAME "SWIG" - DESCRIPTION "SWIG development .i files" - DEPENDS "runtime_swig;uhd_python;uhd_devel" -) - -######################################################################## # Add subdirectories ######################################################################## add_subdirectory(include/gnuradio/uhd) @@ -117,7 +76,6 @@ configure_file( install( FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-uhd.pc DESTINATION ${GR_LIBRARY_DIR}/pkgconfig - COMPONENT "uhd_devel" ) endif(ENABLE_GR_UHD) diff --git a/gr-uhd/apps/CMakeLists.txt b/gr-uhd/apps/CMakeLists.txt index ebcaf6e9f8..ce94a43cff 100644 --- a/gr-uhd/apps/CMakeLists.txt +++ b/gr-uhd/apps/CMakeLists.txt @@ -27,7 +27,6 @@ GR_PYTHON_INSTALL( uhd_siggen_base.py uhd_app.py DESTINATION ${GR_PYTHON_DIR}/gnuradio/uhd - COMPONENT "uhd_python" ) GR_PYTHON_INSTALL( @@ -38,7 +37,6 @@ GR_PYTHON_INSTALL( uhd_siggen_gui uhd_rx_nogui DESTINATION ${GR_RUNTIME_DIR} - COMPONENT "uhd_python" ) ######################################################################## @@ -51,7 +49,6 @@ install( hf_radio/README.TXT hf_radio/ssb_taps DESTINATION ${GR_PKG_DATA_DIR}/examples/hf_radio - COMPONENT "uhd_python" ) GR_PYTHON_INSTALL( @@ -62,7 +59,6 @@ GR_PYTHON_INSTALL( hf_radio/ssbdemod.py hf_radio/startup.py DESTINATION ${GR_PKG_DATA_DIR}/examples/hf_radio - COMPONENT "uhd_python" ) GR_PYTHON_INSTALL( @@ -70,7 +66,6 @@ GR_PYTHON_INSTALL( hf_radio/radio.py hf_radio/ui.py DESTINATION ${GR_PKG_DATA_DIR}/examples/hf_radio - COMPONENT "uhd_python" ) ######################################################################## @@ -81,12 +76,10 @@ install( hf_explorer/README hf_explorer/hfx_help DESTINATION ${GR_PKG_DATA_DIR}/examples/hf_explorer - COMPONENT "uhd_python" ) GR_PYTHON_INSTALL( PROGRAMS hf_explorer/hfx.py DESTINATION ${GR_PKG_DATA_DIR}/examples/hf_explorer - COMPONENT "uhd_python" ) diff --git a/gr-uhd/examples/c++/CMakeLists.txt b/gr-uhd/examples/c++/CMakeLists.txt index 655ef0c0a9..c5a55520f6 100644 --- a/gr-uhd/examples/c++/CMakeLists.txt +++ b/gr-uhd/examples/c++/CMakeLists.txt @@ -40,5 +40,4 @@ target_link_libraries(tags_demo gnuradio-uhd) INSTALL(TARGETS tags_demo DESTINATION ${GR_PKG_UHD_EXAMPLES_DIR} - COMPONENT "uhd_examples" ) diff --git a/gr-uhd/examples/grc/CMakeLists.txt b/gr-uhd/examples/grc/CMakeLists.txt index 06c233d45c..4c124b5c03 100644 --- a/gr-uhd/examples/grc/CMakeLists.txt +++ b/gr-uhd/examples/grc/CMakeLists.txt @@ -27,5 +27,4 @@ install( uhd_tx_dpsk.grc uhd_wbfm_receive.grc DESTINATION ${GR_PKG_UHD_EXAMPLES_DIR} - COMPONENT "uhd_python" ) diff --git a/gr-uhd/examples/python/CMakeLists.txt b/gr-uhd/examples/python/CMakeLists.txt index 7642b536b8..cf50feb148 100644 --- a/gr-uhd/examples/python/CMakeLists.txt +++ b/gr-uhd/examples/python/CMakeLists.txt @@ -38,5 +38,4 @@ GR_PYTHON_INSTALL( usrp_wfm_rcv_sca.py usrp_wxapt_rcv.py DESTINATION ${GR_PKG_UHD_EXAMPLES_DIR} - COMPONENT "uhd_python" ) diff --git a/gr-uhd/grc/CMakeLists.txt b/gr-uhd/grc/CMakeLists.txt index 2d8f24aa3c..d748bfacef 100644 --- a/gr-uhd/grc/CMakeLists.txt +++ b/gr-uhd/grc/CMakeLists.txt @@ -42,5 +42,4 @@ install(FILES uhd_amsg_source.xml uhd_block_tree.xml DESTINATION ${GRC_BLOCKS_DIR} - COMPONENT "uhd_python" ) diff --git a/gr-uhd/include/gnuradio/uhd/CMakeLists.txt b/gr-uhd/include/gnuradio/uhd/CMakeLists.txt index b1f3345d78..8d75afc1bc 100644 --- a/gr-uhd/include/gnuradio/uhd/CMakeLists.txt +++ b/gr-uhd/include/gnuradio/uhd/CMakeLists.txt @@ -27,5 +27,4 @@ install(FILES usrp_sink.h amsg_source.h DESTINATION ${GR_INCLUDE_DIR}/gnuradio/uhd - COMPONENT "uhd_devel" ) diff --git a/gr-uhd/lib/CMakeLists.txt b/gr-uhd/lib/CMakeLists.txt index b57b80b557..2427516c9a 100644 --- a/gr-uhd/lib/CMakeLists.txt +++ b/gr-uhd/lib/CMakeLists.txt @@ -75,7 +75,7 @@ list(APPEND uhd_libs add_library(gnuradio-uhd SHARED ${gr_uhd_sources}) target_link_libraries(gnuradio-uhd ${uhd_libs}) -GR_LIBRARY_FOO(gnuradio-uhd RUNTIME_COMPONENT "uhd_runtime" DEVEL_COMPONENT "uhd_devel") +GR_LIBRARY_FOO(gnuradio-uhd) ######################################################################## # Build static libraries if enabled @@ -91,7 +91,7 @@ if(ENABLE_STATIC_LIBS) endif(NOT WIN32) install(TARGETS gnuradio-uhd_static - ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT "uhd_devel" # .lib file + ARCHIVE DESTINATION lib${LIB_SUFFIX} # .lib file ) else(UHD_VERSION VERSION_GREATER "3.8.1") message(STATUS "Not building gr-uhd static library; requires UHD >= 3.8.2") diff --git a/gr-uhd/python/uhd/CMakeLists.txt b/gr-uhd/python/uhd/CMakeLists.txt index aa1d1a6b4a..ee69e8eb7d 100644 --- a/gr-uhd/python/uhd/CMakeLists.txt +++ b/gr-uhd/python/uhd/CMakeLists.txt @@ -26,7 +26,6 @@ GR_PYTHON_INSTALL( FILES __init__.py DESTINATION ${GR_PYTHON_DIR}/gnuradio/uhd - COMPONENT "uhd_python" ) ######################################################################## diff --git a/gr-uhd/swig/CMakeLists.txt b/gr-uhd/swig/CMakeLists.txt index ef54761d0f..5cbc6c642c 100644 --- a/gr-uhd/swig/CMakeLists.txt +++ b/gr-uhd/swig/CMakeLists.txt @@ -48,12 +48,10 @@ GR_SWIG_MAKE(uhd_swig uhd_swig.i) GR_SWIG_INSTALL( TARGETS uhd_swig DESTINATION ${GR_PYTHON_DIR}/gnuradio/uhd - COMPONENT "uhd_python" ) install( FILES uhd_swig.i ${CMAKE_CURRENT_BINARY_DIR}/uhd_swig_doc.i DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig - COMPONENT "uhd_swig" ) diff --git a/gr-utils/CMakeLists.txt b/gr-utils/CMakeLists.txt index b9d3763e48..d54a06abd1 100644 --- a/gr-utils/CMakeLists.txt +++ b/gr-utils/CMakeLists.txt @@ -46,16 +46,6 @@ GR_REGISTER_COMPONENT("gr-utils" ENABLE_GR_UTILS if(ENABLE_GR_UTILS) ######################################################################## -# Setup CPack components -######################################################################## -include(GrPackage) -CPACK_COMPONENT("utils" - DISPLAY_NAME "Utils" - DESCRIPTION "Misc gnuradio python utilities" - DEPENDS "runtime_python" -) - -######################################################################## # Add subdirectories ######################################################################## add_subdirectory(python/utils) diff --git a/gr-utils/python/modtool/CMakeLists.txt b/gr-utils/python/modtool/CMakeLists.txt index 697a84ddd1..5fc5b0287f 100644 --- a/gr-utils/python/modtool/CMakeLists.txt +++ b/gr-utils/python/modtool/CMakeLists.txt @@ -37,13 +37,11 @@ GR_PYTHON_INSTALL(FILES templates.py util_functions.py DESTINATION ${GR_PYTHON_DIR}/gnuradio/modtool - COMPONENT "utils" ) set(GR_PKG_MODTOOL_DATA_DIR ${GR_PKG_DATA_DIR}/modtool) install(DIRECTORY gr-newmod DESTINATION ${GR_PKG_MODTOOL_DATA_DIR} - COMPONENT "utils" ) @@ -60,6 +58,5 @@ configure_file( install( FILES ${CMAKE_CURRENT_BINARY_DIR}/modtool.conf DESTINATION ${GR_PREFSDIR} - COMPONENT "utils" ) diff --git a/gr-utils/python/modtool/gr-newmod/cmake/Modules/GrMiscUtils.cmake b/gr-utils/python/modtool/gr-newmod/cmake/Modules/GrMiscUtils.cmake index 5bad57c51e..3ed74cf1e2 100644 --- a/gr-utils/python/modtool/gr-newmod/cmake/Modules/GrMiscUtils.cmake +++ b/gr-utils/python/modtool/gr-newmod/cmake/Modules/GrMiscUtils.cmake @@ -135,18 +135,14 @@ endfunction(GR_LIBTOOL) # Also handle gnuradio custom naming conventions w/ extras mode. ######################################################################## function(GR_LIBRARY_FOO target) - #parse the arguments for component names - include(CMakeParseArgumentsCopy) - CMAKE_PARSE_ARGUMENTS(GR_LIBRARY "" "RUNTIME_COMPONENT;DEVEL_COMPONENT" "" ${ARGN}) - #set additional target properties set_target_properties(${target} PROPERTIES SOVERSION ${LIBVER}) #install the generated files like so... install(TARGETS ${target} - LIBRARY DESTINATION ${GR_LIBRARY_DIR} COMPONENT ${GR_LIBRARY_RUNTIME_COMPONENT} # .so/.dylib file - ARCHIVE DESTINATION ${GR_LIBRARY_DIR} COMPONENT ${GR_LIBRARY_DEVEL_COMPONENT} # .lib file - RUNTIME DESTINATION ${GR_RUNTIME_DIR} COMPONENT ${GR_LIBRARY_RUNTIME_COMPONENT} # .dll file + LIBRARY DESTINATION ${GR_LIBRARY_DIR} # .so/.dylib file + ARCHIVE DESTINATION ${GR_LIBRARY_DIR} # .lib file + RUNTIME DESTINATION ${GR_RUNTIME_DIR} # .dll file ) #extras mode enabled automatically on linux @@ -178,7 +174,7 @@ function(GR_LIBRARY_FOO target) FILES ${CMAKE_CURRENT_BINARY_DIR}/lib${target}.so ${CMAKE_CURRENT_BINARY_DIR}/lib${target}-${LIBVER}.so.0 - DESTINATION ${GR_LIBRARY_DIR} COMPONENT ${GR_LIBRARY_RUNTIME_COMPONENT} + DESTINATION ${GR_LIBRARY_DIR} ) endif(LIBRARY_EXTRAS) diff --git a/gr-utils/python/modtool/gr-newmod/cmake/Modules/GrPython.cmake b/gr-utils/python/modtool/gr-newmod/cmake/Modules/GrPython.cmake index 06e061e212..0bfa92db8d 100644 --- a/gr-utils/python/modtool/gr-newmod/cmake/Modules/GrPython.cmake +++ b/gr-utils/python/modtool/gr-newmod/cmake/Modules/GrPython.cmake @@ -130,7 +130,7 @@ endfunction(GR_UNIQUE_TARGET) ######################################################################## function(GR_PYTHON_INSTALL) include(CMakeParseArgumentsCopy) - CMAKE_PARSE_ARGUMENTS(GR_PYTHON_INSTALL "" "DESTINATION;COMPONENT" "FILES;PROGRAMS" ${ARGN}) + CMAKE_PARSE_ARGUMENTS(GR_PYTHON_INSTALL "" "DESTINATION" "FILES;PROGRAMS" ${ARGN}) #################################################################### if(GR_PYTHON_INSTALL_FILES) @@ -182,7 +182,6 @@ function(GR_PYTHON_INSTALL) set(python_install_gen_targets ${pycfiles} ${pyofiles}) install(FILES ${python_install_gen_targets} DESTINATION ${GR_PYTHON_INSTALL_DESTINATION} - COMPONENT ${GR_PYTHON_INSTALL_COMPONENT} ) #################################################################### @@ -219,7 +218,6 @@ function(GR_PYTHON_INSTALL) install(PROGRAMS ${pyexefile} RENAME ${pyfile_name} DESTINATION ${GR_PYTHON_INSTALL_DESTINATION} - COMPONENT ${GR_PYTHON_INSTALL_COMPONENT} ) endforeach(pyfile) diff --git a/gr-utils/python/modtool/gr-newmod/cmake/Modules/GrSwig.cmake b/gr-utils/python/modtool/gr-newmod/cmake/Modules/GrSwig.cmake index abf4dc4612..ab8926ba7e 100644 --- a/gr-utils/python/modtool/gr-newmod/cmake/Modules/GrSwig.cmake +++ b/gr-utils/python/modtool/gr-newmod/cmake/Modules/GrSwig.cmake @@ -183,24 +183,21 @@ endmacro(GR_SWIG_MAKE) # GR_SWIG_INSTALL( # TARGETS target target target... # [DESTINATION destination] -# [COMPONENT component] # ) ######################################################################## macro(GR_SWIG_INSTALL) include(CMakeParseArgumentsCopy) - CMAKE_PARSE_ARGUMENTS(GR_SWIG_INSTALL "" "DESTINATION;COMPONENT" "TARGETS" ${ARGN}) + CMAKE_PARSE_ARGUMENTS(GR_SWIG_INSTALL "" "DESTINATION" "TARGETS" ${ARGN}) foreach(name ${GR_SWIG_INSTALL_TARGETS}) install(TARGETS ${SWIG_MODULE_${name}_REAL_NAME} DESTINATION ${GR_SWIG_INSTALL_DESTINATION} - COMPONENT ${GR_SWIG_INSTALL_COMPONENT} ) include(GrPython) GR_PYTHON_INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${name}.py DESTINATION ${GR_SWIG_INSTALL_DESTINATION} - COMPONENT ${GR_SWIG_INSTALL_COMPONENT} ) GR_LIBTOOL( diff --git a/gr-utils/python/modtool/gr-newmod/lib/CMakeLists.txt b/gr-utils/python/modtool/gr-newmod/lib/CMakeLists.txt index 10a15b7dd9..24ffa41fc1 100644 --- a/gr-utils/python/modtool/gr-newmod/lib/CMakeLists.txt +++ b/gr-utils/python/modtool/gr-newmod/lib/CMakeLists.txt @@ -48,7 +48,7 @@ endif(APPLE) # Install built library files ######################################################################## include(GrMiscUtils) -GR_LIBRARY_FOO(gnuradio-howto RUNTIME_COMPONENT "howto_runtime" DEVEL_COMPONENT "howto_devel") +GR_LIBRARY_FOO(gnuradio-howto) ######################################################################## # Build and register unit test @@ -79,4 +79,3 @@ GR_ADD_TEST(test_howto test-howto) ######################################################################## message(STATUS "Using install prefix: ${CMAKE_INSTALL_PREFIX}") message(STATUS "Building for version: ${VERSION} / ${LIBVER}") - diff --git a/gr-utils/python/utils/CMakeLists.txt b/gr-utils/python/utils/CMakeLists.txt index 54eba51170..46a21c1508 100644 --- a/gr-utils/python/utils/CMakeLists.txt +++ b/gr-utils/python/utils/CMakeLists.txt @@ -30,7 +30,6 @@ GR_PYTHON_INSTALL( pyqt_plot.py pyqt_filter.py DESTINATION ${GR_PYTHON_DIR}/gnuradio - COMPONENT "utils" ) GR_PYTHON_INSTALL( @@ -52,5 +51,4 @@ GR_PYTHON_INSTALL( gr_read_file_metadata grcc DESTINATION ${GR_RUNTIME_DIR} - COMPONENT "utils" ) diff --git a/gr-video-sdl/CMakeLists.txt b/gr-video-sdl/CMakeLists.txt index 50975eb675..a171535c37 100644 --- a/gr-video-sdl/CMakeLists.txt +++ b/gr-video-sdl/CMakeLists.txt @@ -45,40 +45,6 @@ GR_SET_GLOBAL(GR_VIDEO_SDL_INCLUDE_DIRS if(ENABLE_GR_VIDEO_SDL) ######################################################################## -# Setup CPack components -######################################################################## -include(GrPackage) -CPACK_SET(CPACK_COMPONENT_GROUP_VIDEO_SDL_DESCRIPTION "GNU Radio Video SDL Blocks") - -CPACK_COMPONENT("video_sdl_runtime" - GROUP "Video SDL" - DISPLAY_NAME "Runtime" - DESCRIPTION "Runtime" - DEPENDS "runtime_runtime" -) - -CPACK_COMPONENT("video_sdl_devel" - GROUP "Video SDL" - DISPLAY_NAME "Development" - DESCRIPTION "C++ headers, package config, import libraries" - DEPENDS "runtime_devel" -) - -CPACK_COMPONENT("video_sdl_python" - GROUP "Video SDL" - DISPLAY_NAME "Python" - DESCRIPTION "Python modules for runtime; GRC xml files" - DEPENDS "runtime_python;video_sdl_runtime" -) - -CPACK_COMPONENT("video_sdl_swig" - GROUP "Video SDL" - DISPLAY_NAME "SWIG" - DESCRIPTION "SWIG development .i files" - DEPENDS "runtime_swig;video_sdl_python;video_sdl_devel" -) - -######################################################################## # Add subdirectories ######################################################################## add_subdirectory(include/gnuradio/video_sdl) @@ -100,7 +66,6 @@ configure_file( install( FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-video-sdl.pc DESTINATION ${GR_LIBRARY_DIR}/pkgconfig - COMPONENT "video_sdl_devel" ) endif(ENABLE_GR_VIDEO_SDL) diff --git a/gr-video-sdl/grc/CMakeLists.txt b/gr-video-sdl/grc/CMakeLists.txt index b696224274..f62d41b6db 100644 --- a/gr-video-sdl/grc/CMakeLists.txt +++ b/gr-video-sdl/grc/CMakeLists.txt @@ -23,5 +23,3 @@ install(FILES DESTINATION share/gnuradio/grc/blocks ) - - diff --git a/gr-video-sdl/include/gnuradio/video_sdl/CMakeLists.txt b/gr-video-sdl/include/gnuradio/video_sdl/CMakeLists.txt index 8831fd8172..97b211031d 100644 --- a/gr-video-sdl/include/gnuradio/video_sdl/CMakeLists.txt +++ b/gr-video-sdl/include/gnuradio/video_sdl/CMakeLists.txt @@ -25,6 +25,5 @@ install(FILES sink_s.h sink_uc.h DESTINATION ${GR_INCLUDE_DIR}/gnuradio/video_sdl - COMPONENT "video_sdl_devel" ) diff --git a/gr-video-sdl/lib/CMakeLists.txt b/gr-video-sdl/lib/CMakeLists.txt index 42ad24e3ff..d43f0bb914 100644 --- a/gr-video-sdl/lib/CMakeLists.txt +++ b/gr-video-sdl/lib/CMakeLists.txt @@ -65,7 +65,7 @@ ENDIF(MSVC) add_library(gnuradio-video-sdl SHARED ${video_sdl_sources}) target_link_libraries(gnuradio-video-sdl ${video_sdl_libs}) -GR_LIBRARY_FOO(gnuradio-video-sdl RUNTIME_COMPONENT "video_sdl_runtime" DEVEL_COMPONENT "video_sdl_devel") +GR_LIBRARY_FOO(gnuradio-video-sdl) add_dependencies(gnuradio-video-sdl gnuradio-runtime) if(ENABLE_STATIC_LIBS) @@ -90,6 +90,6 @@ if(ENABLE_STATIC_LIBS) endif(NOT WIN32) install(TARGETS gnuradio-video-sdl_static - ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT "video_sdl_devel" # .lib file + ARCHIVE DESTINATION lib${LIB_SUFFIX} # .lib file ) endif(ENABLE_STATIC_LIBS) diff --git a/gr-video-sdl/python/video_sdl/CMakeLists.txt b/gr-video-sdl/python/video_sdl/CMakeLists.txt index 7b2f01aace..6465affa10 100644 --- a/gr-video-sdl/python/video_sdl/CMakeLists.txt +++ b/gr-video-sdl/python/video_sdl/CMakeLists.txt @@ -26,7 +26,6 @@ GR_PYTHON_INSTALL( FILES __init__.py DESTINATION ${GR_PYTHON_DIR}/gnuradio/video_sdl - COMPONENT "video_sdl_python" ) ######################################################################## diff --git a/gr-video-sdl/swig/CMakeLists.txt b/gr-video-sdl/swig/CMakeLists.txt index 46343741a1..0d5974f21c 100644 --- a/gr-video-sdl/swig/CMakeLists.txt +++ b/gr-video-sdl/swig/CMakeLists.txt @@ -48,7 +48,6 @@ GR_SWIG_MAKE(video_sdl_swig video_sdl_swig.i) GR_SWIG_INSTALL( TARGETS video_sdl_swig DESTINATION ${GR_PYTHON_DIR}/gnuradio/video_sdl - COMPONENT "video_sdl_python" ) install( @@ -56,5 +55,4 @@ install( video_sdl_swig.i ${CMAKE_CURRENT_BINARY_DIR}/video_sdl_swig_doc.i DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig - COMPONENT "video_sdl_swig" ) diff --git a/gr-vocoder/CMakeLists.txt b/gr-vocoder/CMakeLists.txt index 37c0cf70e9..2fb9986a70 100644 --- a/gr-vocoder/CMakeLists.txt +++ b/gr-vocoder/CMakeLists.txt @@ -48,47 +48,6 @@ SET(GR_PKG_VOCODER_EXAMPLES_DIR ${GR_PKG_DATA_DIR}/examples/vocoder) if(ENABLE_GR_VOCODER) ######################################################################## -# Setup CPack components -######################################################################## -include(GrPackage) -CPACK_SET(CPACK_COMPONENT_GROUP_VOCODER_DESCRIPTION "GNU Radio Vocoder Blocks") - -CPACK_COMPONENT("vocoder_runtime" - GROUP "Vocoder" - DISPLAY_NAME "Runtime" - DESCRIPTION "Dynamic link libraries" - DEPENDS "runtime_runtime" -) - -CPACK_COMPONENT("vocoder_devel" - GROUP "Vocoder" - DISPLAY_NAME "Development" - DESCRIPTION "C++ headers, package config, import libraries" - DEPENDS "runtime_devel" -) - -CPACK_COMPONENT("vocoder_python" - GROUP "Vocoder" - DISPLAY_NAME "Python" - DESCRIPTION "Python modules for runtime" - DEPENDS "runtime_python;vocoder_runtime" -) - -CPACK_COMPONENT("vocoder_examples" - GROUP "Vocoder" - DISPLAY_NAME "Examples" - DESCRIPTION "Python examples for vocoder" - DEPENDS "vocoder_python" -) - -CPACK_COMPONENT("vocoder_swig" - GROUP "Vocoder" - DISPLAY_NAME "SWIG" - DESCRIPTION "SWIG development .i files" - DEPENDS "runtime_swig;vocoder_python;vocoder_devel" -) - -######################################################################## # Add subdirectories ######################################################################## add_subdirectory(include/gnuradio/vocoder) @@ -112,7 +71,6 @@ configure_file( install( FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-vocoder.pc DESTINATION ${GR_LIBRARY_DIR}/pkgconfig - COMPONENT "vocoder_devel" ) endif(ENABLE_GR_VOCODER) diff --git a/gr-vocoder/examples/CMakeLists.txt b/gr-vocoder/examples/CMakeLists.txt index 769ddf602a..fc92ecd88e 100644 --- a/gr-vocoder/examples/CMakeLists.txt +++ b/gr-vocoder/examples/CMakeLists.txt @@ -33,5 +33,4 @@ GR_PYTHON_INSTALL( gsm_audio_loopback.py ulaw_audio_loopback.py DESTINATION ${GR_PKG_VOCODER_EXAMPLES_DIR} - COMPONENT "vocoder_examples" ) diff --git a/gr-vocoder/grc/CMakeLists.txt b/gr-vocoder/grc/CMakeLists.txt index f8cf8231b2..0f8bbb0637 100644 --- a/gr-vocoder/grc/CMakeLists.txt +++ b/gr-vocoder/grc/CMakeLists.txt @@ -38,5 +38,4 @@ install(FILES vocoder_ulaw_decode_bs.xml vocoder_ulaw_encode_sb.xml DESTINATION ${GRC_BLOCKS_DIR} - COMPONENT "vocoder_python" ) diff --git a/gr-vocoder/include/gnuradio/vocoder/CMakeLists.txt b/gr-vocoder/include/gnuradio/vocoder/CMakeLists.txt index 60f75e7913..ed0990dd62 100644 --- a/gr-vocoder/include/gnuradio/vocoder/CMakeLists.txt +++ b/gr-vocoder/include/gnuradio/vocoder/CMakeLists.txt @@ -37,5 +37,4 @@ install(FILES ulaw_decode_bs.h ulaw_encode_sb.h DESTINATION ${GR_INCLUDE_DIR}/gnuradio/vocoder - COMPONENT "vocoder_devel" ) diff --git a/gr-vocoder/lib/CMakeLists.txt b/gr-vocoder/lib/CMakeLists.txt index a347cbf7fe..29075afea2 100644 --- a/gr-vocoder/lib/CMakeLists.txt +++ b/gr-vocoder/lib/CMakeLists.txt @@ -232,7 +232,7 @@ endif(GR_USE_SYSTEM_LIBGSM) add_library(gnuradio-vocoder SHARED ${gr_vocoder_sources}) target_link_libraries(gnuradio-vocoder ${vocoder_libs}) -GR_LIBRARY_FOO(gnuradio-vocoder RUNTIME_COMPONENT "vocoder_runtime" DEVEL_COMPONENT "vocoder_devel") +GR_LIBRARY_FOO(gnuradio-vocoder) if(ENABLE_STATIC_LIBS) if(ENABLE_GR_CTRLPORT) @@ -254,6 +254,6 @@ if(ENABLE_STATIC_LIBS) endif(NOT WIN32) install(TARGETS gnuradio-vocoder_static - ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT "vocoder_devel" # .lib file + ARCHIVE DESTINATION lib${LIB_SUFFIX} # .lib file ) endif(ENABLE_STATIC_LIBS) diff --git a/gr-vocoder/python/vocoder/CMakeLists.txt b/gr-vocoder/python/vocoder/CMakeLists.txt index ca8323daab..31317aee2e 100644 --- a/gr-vocoder/python/vocoder/CMakeLists.txt +++ b/gr-vocoder/python/vocoder/CMakeLists.txt @@ -27,7 +27,6 @@ GR_PYTHON_INSTALL( __init__.py cvsd.py DESTINATION ${GR_PYTHON_DIR}/gnuradio/vocoder - COMPONENT "vocoder_python" ) ######################################################################## diff --git a/gr-vocoder/swig/CMakeLists.txt b/gr-vocoder/swig/CMakeLists.txt index 26623969a7..e2079a05de 100644 --- a/gr-vocoder/swig/CMakeLists.txt +++ b/gr-vocoder/swig/CMakeLists.txt @@ -44,7 +44,6 @@ GR_SWIG_MAKE(vocoder_swig vocoder_swig.i) GR_SWIG_INSTALL( TARGETS vocoder_swig DESTINATION ${GR_PYTHON_DIR}/gnuradio/vocoder - COMPONENT "vocoder_python" ) install( @@ -52,5 +51,4 @@ install( vocoder_swig.i ${CMAKE_CURRENT_BINARY_DIR}/vocoder_swig_doc.i DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig - COMPONENT "vocoder_swig" ) diff --git a/gr-wavelet/CMakeLists.txt b/gr-wavelet/CMakeLists.txt index bdc19a1ebc..aab17ae7f3 100644 --- a/gr-wavelet/CMakeLists.txt +++ b/gr-wavelet/CMakeLists.txt @@ -48,40 +48,6 @@ GR_SET_GLOBAL(GR_WAVELET_INCLUDE_DIRS if(ENABLE_GR_WAVELET) ######################################################################## -# Setup CPack components -######################################################################## -include(GrPackage) -CPACK_SET(CPACK_COMPONENT_GROUP_WAVELET_DESCRIPTION "GNU Radio Wavelet Blocks") - -CPACK_COMPONENT("wavelet_runtime" - GROUP "WAVELET" - DISPLAY_NAME "Runtime" - DESCRIPTION "Runtime" - DEPENDS "runtime_runtime" -) - -CPACK_COMPONENT("wavelet_devel" - GROUP "WAVELET" - DISPLAY_NAME "Development" - DESCRIPTION "C++ headers, package config, import libraries" - DEPENDS "runtime_devel" -) - -CPACK_COMPONENT("wavelet_python" - GROUP "WAVELET" - DISPLAY_NAME "Python" - DESCRIPTION "Python modules for runtime; GRC xml files" - DEPENDS "runtime_python;wavelet_runtime" -) - -CPACK_COMPONENT("wavelet_swig" - GROUP "WAVELET" - DISPLAY_NAME "SWIG" - DESCRIPTION "SWIG development .i files" - DEPENDS "runtime_swig;wavelet_python;wavelet_devel" -) - -######################################################################## # Add subdirectories ######################################################################## add_subdirectory(include/gnuradio/wavelet) @@ -105,7 +71,6 @@ configure_file( install( FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-wavelet.pc DESTINATION ${GR_LIBRARY_DIR}/pkgconfig - COMPONENT "wavelet_devel" ) endif(ENABLE_GR_WAVELET) diff --git a/gr-wavelet/include/gnuradio/wavelet/CMakeLists.txt b/gr-wavelet/include/gnuradio/wavelet/CMakeLists.txt index 43c1603d15..c1fcd9c3ea 100644 --- a/gr-wavelet/include/gnuradio/wavelet/CMakeLists.txt +++ b/gr-wavelet/include/gnuradio/wavelet/CMakeLists.txt @@ -26,6 +26,5 @@ install(FILES wavelet_ff.h wvps_ff.h DESTINATION ${GR_INCLUDE_DIR}/gnuradio/wavelet - COMPONENT "wavelet_devel" ) diff --git a/gr-wavelet/lib/CMakeLists.txt b/gr-wavelet/lib/CMakeLists.txt index be2a7a8471..3ae8e591af 100644 --- a/gr-wavelet/lib/CMakeLists.txt +++ b/gr-wavelet/lib/CMakeLists.txt @@ -85,7 +85,7 @@ if(CMAKE_COMPILER_IS_GNUCC AND NOT APPLE) SET_TARGET_PROPERTIES(gnuradio-wavelet PROPERTIES LINK_FLAGS "-Wl,--no-as-needed") endif() -GR_LIBRARY_FOO(gnuradio-wavelet RUNTIME_COMPONENT "wavelet_runtime" DEVEL_COMPONENT "wavelet_devel") +GR_LIBRARY_FOO(gnuradio-wavelet) add_dependencies(gnuradio-wavelet wavelet_generated_includes wavelet_generated_swigs gnuradio-runtime) @@ -113,6 +113,6 @@ if(ENABLE_STATIC_LIBS) endif(NOT WIN32) install(TARGETS gnuradio-wavelet_static - ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT "wavelet_devel" # .lib file + ARCHIVE DESTINATION lib${LIB_SUFFIX} # .lib file ) endif(ENABLE_STATIC_LIBS) diff --git a/gr-wavelet/python/wavelet/CMakeLists.txt b/gr-wavelet/python/wavelet/CMakeLists.txt index bb88c50b65..9e1961d4e0 100644 --- a/gr-wavelet/python/wavelet/CMakeLists.txt +++ b/gr-wavelet/python/wavelet/CMakeLists.txt @@ -24,7 +24,6 @@ GR_PYTHON_INSTALL( FILES __init__.py DESTINATION ${GR_PYTHON_DIR}/gnuradio/wavelet - COMPONENT "wavelet_python" ) ######################################################################## diff --git a/gr-wavelet/swig/CMakeLists.txt b/gr-wavelet/swig/CMakeLists.txt index 1f31497844..d9bc02edab 100644 --- a/gr-wavelet/swig/CMakeLists.txt +++ b/gr-wavelet/swig/CMakeLists.txt @@ -46,7 +46,6 @@ GR_SWIG_MAKE(wavelet_swig wavelet_swig.i) GR_SWIG_INSTALL( TARGETS wavelet_swig DESTINATION ${GR_PYTHON_DIR}/gnuradio/wavelet - COMPONENT "wavelet_python" ) install( @@ -54,5 +53,4 @@ install( wavelet_swig.i ${CMAKE_CURRENT_BINARY_DIR}/wavelet_swig_doc.i DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig - COMPONENT "wavelet_swig" ) diff --git a/gr-wxgui/CMakeLists.txt b/gr-wxgui/CMakeLists.txt index 3d8b59c691..d77e36ad4a 100644 --- a/gr-wxgui/CMakeLists.txt +++ b/gr-wxgui/CMakeLists.txt @@ -59,37 +59,6 @@ GR_SET_GLOBAL(GR_WXGUI_INCLUDE_DIRS ) ######################################################################## -# Setup CPack components -######################################################################## -include(GrPackage) -CPACK_COMPONENT("wxgui_runtime" - DISPLAY_NAME "WxGUI" - DESCRIPTION "Wx GUI plotter widgets and grc wrappers" - DEPENDS "runtime_python" -) - -CPACK_COMPONENT("wxgui_devel" - GROUP "WxGUI" - DISPLAY_NAME "Development" - DESCRIPTION "C++ headers, package config, import libraries" - DEPENDS "runtime_devel" -) - -CPACK_COMPONENT("wxgui_python" - GROUP "WxGUI" - DISPLAY_NAME "Python" - DESCRIPTION "Python modules for runtime; GRC xml files" - DEPENDS "runtime_python;wxgui_runtime" -) - -CPACK_COMPONENT("wxgui_swig" - GROUP "WxGUI" - DISPLAY_NAME "SWIG" - DESCRIPTION "SWIG development .i files" - DEPENDS "runtime_swig;wxgui_python;wxgui_devel" -) - -######################################################################## # Create Pkg Config File ######################################################################## configure_file( @@ -100,7 +69,6 @@ configure_file( install( FILES ${CMAKE_CURRENT_BINARY_DIR}/gr-wxgui.pc DESTINATION ${GR_LIBRARY_DIR}/pkgconfig - COMPONENT "wxgui" ) ######################################################################## @@ -109,7 +77,6 @@ install( install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/gr-wxgui.conf DESTINATION ${GR_PREFSDIR} - COMPONENT "wxgui" ) ######################################################################## diff --git a/gr-wxgui/grc/CMakeLists.txt b/gr-wxgui/grc/CMakeLists.txt index 9ee6e2370e..52c9bbda43 100644 --- a/gr-wxgui/grc/CMakeLists.txt +++ b/gr-wxgui/grc/CMakeLists.txt @@ -19,7 +19,7 @@ ######################################################################## file(GLOB xml_files "*.xml") -install(FILES ${xml_files} DESTINATION ${GRC_BLOCKS_DIR} COMPONENT "wxgui_python") +install(FILES ${xml_files} DESTINATION ${GRC_BLOCKS_DIR}) ######################################################################## #The wxgui module contains a top_block + wxgui frame. @@ -32,5 +32,4 @@ GR_PYTHON_INSTALL( panel.py top_block_gui.py DESTINATION ${GR_PYTHON_DIR}/grc_gnuradio/wxgui - COMPONENT "wxgui_python" ) diff --git a/gr-wxgui/include/gnuradio/wxgui/CMakeLists.txt b/gr-wxgui/include/gnuradio/wxgui/CMakeLists.txt index fad84792e1..468d9b7992 100644 --- a/gr-wxgui/include/gnuradio/wxgui/CMakeLists.txt +++ b/gr-wxgui/include/gnuradio/wxgui/CMakeLists.txt @@ -28,5 +28,4 @@ install(FILES oscope_sink_x.h trigger_mode.h DESTINATION ${GR_INCLUDE_DIR}/gnuradio/wxgui - COMPONENT "wxgui_devel" ) diff --git a/gr-wxgui/lib/CMakeLists.txt b/gr-wxgui/lib/CMakeLists.txt index d4c244177f..2f1f6135f3 100644 --- a/gr-wxgui/lib/CMakeLists.txt +++ b/gr-wxgui/lib/CMakeLists.txt @@ -71,9 +71,7 @@ list(APPEND wxgui_libs add_library(gnuradio-wxgui SHARED ${gr_wxgui_sources}) target_link_libraries(gnuradio-wxgui ${wxgui_libs}) -GR_LIBRARY_FOO(gnuradio-wxgui - RUNTIME_COMPONENT "wxgui_runtime" - DEVEL_COMPONENT "wxgui_devel") +GR_LIBRARY_FOO(gnuradio-wxgui) if(ENABLE_STATIC_LIBS) if(ENABLE_GR_CTRLPORT) @@ -95,6 +93,6 @@ if(ENABLE_STATIC_LIBS) endif(NOT WIN32) install(TARGETS gnuradio-wxgui_static - ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT "wxgui_devel" # .lib file + ARCHIVE DESTINATION lib${LIB_SUFFIX} # .lib file ) endif(ENABLE_STATIC_LIBS) diff --git a/gr-wxgui/python/wxgui/CMakeLists.txt b/gr-wxgui/python/wxgui/CMakeLists.txt index 3a5cc11527..a06cba70b7 100644 --- a/gr-wxgui/python/wxgui/CMakeLists.txt +++ b/gr-wxgui/python/wxgui/CMakeLists.txt @@ -55,7 +55,6 @@ GR_PYTHON_INSTALL( slider.py stdgui2.py DESTINATION ${GR_PYTHON_DIR}/gnuradio/wxgui - COMPONENT "wxgui_python" ) ######################################################################## @@ -67,7 +66,6 @@ GR_PYTHON_INSTALL( forms/forms.py forms/converters.py DESTINATION ${GR_PYTHON_DIR}/gnuradio/wxgui/forms - COMPONENT "wxgui_python" ) ######################################################################## @@ -84,5 +82,4 @@ GR_PYTHON_INSTALL( plotter/plotter_base.py plotter/waterfall_plotter.py DESTINATION ${GR_PYTHON_DIR}/gnuradio/wxgui/plotter - COMPONENT "wxgui_python" ) diff --git a/gr-wxgui/swig/CMakeLists.txt b/gr-wxgui/swig/CMakeLists.txt index 034036e267..4eb11633a7 100644 --- a/gr-wxgui/swig/CMakeLists.txt +++ b/gr-wxgui/swig/CMakeLists.txt @@ -45,7 +45,6 @@ GR_SWIG_MAKE(wxgui_swig wxgui_swig.i) GR_SWIG_INSTALL( TARGETS wxgui_swig DESTINATION ${GR_PYTHON_DIR}/gnuradio/wxgui - COMPONENT "wxgui_python" ) install( @@ -53,5 +52,4 @@ install( wxgui_swig.i ${CMAKE_CURRENT_BINARY_DIR}/wxgui_swig_doc.i DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig - COMPONENT "wxgui_swig" ) diff --git a/gr-zeromq/CMakeLists.txt b/gr-zeromq/CMakeLists.txt index ffb9a0fc67..1ebd0ff4f5 100644 --- a/gr-zeromq/CMakeLists.txt +++ b/gr-zeromq/CMakeLists.txt @@ -47,41 +47,6 @@ SET(GR_PKG_ZEROMQ_EXAMPLES_DIR ${GR_PKG_DATA_DIR}/examples/zeromq) ######################################################################## if(ENABLE_GR_ZEROMQ) - -######################################################################## -# Setup CPack components -######################################################################## -include(GrPackage) -CPACK_SET(CPACK_COMPONENT_GROUP_ZEROMQ_DESCRIPTION "GNU Radio ZeromMQ Interface Blocks") - -CPACK_COMPONENT("zeromq_runtime" - GROUP "ZeroMQ Blocks" - DISPLAY_NAME "Runtime" - DESCRIPTION "Runtime" - DEPENDS "runtime_runtime" -) - -CPACK_COMPONENT("zeromq_devel" - GROUP "ZeroMQ Blocks" - DISPLAY_NAME "Development" - DESCRIPTION "C++ headers, package config, import libraries" - DEPENDS "runtime_devel" -) - -CPACK_COMPONENT("zeromq_python" - GROUP "ZeroMQ Blocks" - DISPLAY_NAME "Python" - DESCRIPTION "Python modules for runtime; GRC xml files" - DEPENDS "runtime_python;zeromq_runtime" -) - -CPACK_COMPONENT("zeromq_swig" - GROUP "ZeroMQ Blocks" - DISPLAY_NAME "SWIG" - DESCRIPTION "SWIG development .i files" - DEPENDS "runtime_swig;zeromq_python;zeromq_devel" -) - ######################################################################## # Add subdirectories ######################################################################## @@ -105,7 +70,6 @@ configure_file( install( FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-zeromq.pc DESTINATION ${GR_LIBRARY_DIR}/pkgconfig - COMPONENT "zeromq_devel" ) endif(ENABLE_GR_ZEROMQ) diff --git a/gr-zeromq/examples/CMakeLists.txt b/gr-zeromq/examples/CMakeLists.txt index ce673cf1f5..dd31185d99 100644 --- a/gr-zeromq/examples/CMakeLists.txt +++ b/gr-zeromq/examples/CMakeLists.txt @@ -27,5 +27,4 @@ INSTALL(FILES zmq_msg.grc zmq_stream.grc DESTINATION ${GR_PKG_ZEROMQ_EXAMPLES_DIR} - COMPONENT "zeromq_python" ) diff --git a/gr-zeromq/include/gnuradio/zeromq/CMakeLists.txt b/gr-zeromq/include/gnuradio/zeromq/CMakeLists.txt index d365532003..5e99ab140b 100644 --- a/gr-zeromq/include/gnuradio/zeromq/CMakeLists.txt +++ b/gr-zeromq/include/gnuradio/zeromq/CMakeLists.txt @@ -36,5 +36,4 @@ install(FILES req_msg_source.h DESTINATION ${GR_INCLUDE_DIR}/gnuradio/zeromq - COMPONENT "zeromq_devel" ) diff --git a/gr-zeromq/lib/CMakeLists.txt b/gr-zeromq/lib/CMakeLists.txt index d7b03fa4ed..880a6522a9 100644 --- a/gr-zeromq/lib/CMakeLists.txt +++ b/gr-zeromq/lib/CMakeLists.txt @@ -75,7 +75,7 @@ list(APPEND zeromq_libs add_library(gnuradio-zeromq SHARED ${zeromq_sources}) target_link_libraries(gnuradio-zeromq ${zeromq_libs}) -GR_LIBRARY_FOO(gnuradio-zeromq RUNTIME_COMPONENT "zeromq_runtime" DEVEL_COMPONENT "zeromq_devel") +GR_LIBRARY_FOO(gnuradio-zeromq) if(ENABLE_STATIC_LIBS) if(ENABLE_GR_CTRLPORT) @@ -97,6 +97,6 @@ if(ENABLE_STATIC_LIBS) endif(NOT WIN32) install(TARGETS gnuradio-zeromq_static - ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT "zeromq_devel" # .lib file + ARCHIVE DESTINATION lib${LIB_SUFFIX} # .lib file ) endif(ENABLE_STATIC_LIBS) diff --git a/gr-zeromq/swig/CMakeLists.txt b/gr-zeromq/swig/CMakeLists.txt index 5c2aff2ed0..0c557a3ffa 100644 --- a/gr-zeromq/swig/CMakeLists.txt +++ b/gr-zeromq/swig/CMakeLists.txt @@ -44,7 +44,6 @@ GR_SWIG_MAKE(zeromq_swig zeromq_swig.i) GR_SWIG_INSTALL( TARGETS zeromq_swig DESTINATION ${GR_PYTHON_DIR}/gnuradio/zeromq - COMPONENT "zeromq_python" ) install( @@ -52,5 +51,4 @@ install( zeromq_swig.i ${CMAKE_CURRENT_BINARY_DIR}/zeromq_swig_doc.i DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig - COMPONENT "zeromq_swig" ) diff --git a/grc/CMakeLists.txt b/grc/CMakeLists.txt index 4c782a7f7d..eed5202657 100644 --- a/grc/CMakeLists.txt +++ b/grc/CMakeLists.txt @@ -54,16 +54,6 @@ GR_REGISTER_COMPONENT("gnuradio-companion" ENABLE_GRC if(ENABLE_GRC) ######################################################################## -# Setup CPack components -######################################################################## -include(GrPackage) -CPACK_COMPONENT("grc" - DISPLAY_NAME "GNU Radio Companion" - DESCRIPTION "Graphical flow graph designer" - DEPENDS "runtime_python" -) - -######################################################################## # Create and install the grc conf file ######################################################################## file(TO_NATIVE_PATH ${CMAKE_INSTALL_PREFIX}/${GRC_BLOCKS_DIR} blocksdir) @@ -93,7 +83,6 @@ configure_file( install( FILES ${CMAKE_CURRENT_BINARY_DIR}/grc.conf DESTINATION ${GR_PREFSDIR} - COMPONENT "grc" ) file(GLOB py_files "*.py") @@ -101,7 +90,6 @@ file(GLOB py_files "*.py") GR_PYTHON_INSTALL( FILES ${py_files} DESTINATION ${GR_PYTHON_DIR}/gnuradio/grc - COMPONENT "grc" ) ######################################################################## @@ -118,18 +106,6 @@ string(REPLACE "\\" "\\\\" GRC_BLOCKS_PATH ${GRC_BLOCKS_PATH}) file(TO_NATIVE_PATH ${GR_PYTHON_DIR} GR_PYTHON_POSTFIX) string(REPLACE "\\" "\\\\" GR_PYTHON_POSTFIX ${GR_PYTHON_POSTFIX}) -CPACK_SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "${CPACK_NSIS_EXTRA_INSTALL_COMMANDS} - #!include \\\"winmessages.nsh\\\" - WriteRegStr HKLM ${HLKM_ENV} \\\"GRC_BLOCKS_PATH\\\" \\\"$INSTDIR\\\\${GRC_BLOCKS_PATH}\\\" - SendMessage \\\${HWND_BROADCAST} \\\${WM_WININICHANGE} 0 \\\"STR:Environment\\\" /TIMEOUT=5000 -") - -CPACK_SET(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "${CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS} - #!include \\\"winmessages.nsh\\\" - DeleteRegValue HKLM ${HLKM_ENV} \\\"GRC_BLOCKS_PATH\\\" - SendMessage \\\${HWND_BROADCAST} \\\${WM_WININICHANGE} 0 \\\"STR:Environment\\\" /TIMEOUT=5000 -") - endif(WIN32) ######################################################################## diff --git a/grc/blocks/CMakeLists.txt b/grc/blocks/CMakeLists.txt index 0c2a1f7901..eaa57970a6 100644 --- a/grc/blocks/CMakeLists.txt +++ b/grc/blocks/CMakeLists.txt @@ -39,5 +39,4 @@ add_custom_target(grc_generated_xml ALL DEPENDS ${generated_xml_files}) install( FILES ${xml_files} ${generated_xml_files} DESTINATION ${GRC_BLOCKS_DIR} - COMPONENT "grc" ) diff --git a/grc/core/CMakeLists.txt b/grc/core/CMakeLists.txt index 51b0dacba6..f340127873 100644 --- a/grc/core/CMakeLists.txt +++ b/grc/core/CMakeLists.txt @@ -22,7 +22,6 @@ file(GLOB py_files "*.py") GR_PYTHON_INSTALL( FILES ${py_files} DESTINATION ${GR_PYTHON_DIR}/gnuradio/grc/core - COMPONENT "grc" ) file(GLOB dtd_files "*.dtd") @@ -30,7 +29,6 @@ file(GLOB dtd_files "*.dtd") install( FILES ${dtd_files} default_flow_graph.grc DESTINATION ${GR_PYTHON_DIR}/gnuradio/grc/core - COMPONENT "grc" ) add_subdirectory(generator) diff --git a/grc/core/generator/CMakeLists.txt b/grc/core/generator/CMakeLists.txt index 4bdd59a7a2..492ad7c4ad 100644 --- a/grc/core/generator/CMakeLists.txt +++ b/grc/core/generator/CMakeLists.txt @@ -22,11 +22,9 @@ file(GLOB py_files "*.py") GR_PYTHON_INSTALL( FILES ${py_files} DESTINATION ${GR_PYTHON_DIR}/gnuradio/grc/core/generator - COMPONENT "grc" ) install(FILES flow_graph.tmpl DESTINATION ${GR_PYTHON_DIR}/gnuradio/grc/core/generator - COMPONENT "grc" ) diff --git a/grc/core/utils/CMakeLists.txt b/grc/core/utils/CMakeLists.txt index 2528fbc43c..3ba65258a5 100644 --- a/grc/core/utils/CMakeLists.txt +++ b/grc/core/utils/CMakeLists.txt @@ -22,5 +22,4 @@ file(GLOB py_files "*.py") GR_PYTHON_INSTALL( FILES ${py_files} DESTINATION ${GR_PYTHON_DIR}/gnuradio/grc/core/utils - COMPONENT "grc" ) diff --git a/grc/gui/CMakeLists.txt b/grc/gui/CMakeLists.txt index aa9592b351..12be4a8151 100644 --- a/grc/gui/CMakeLists.txt +++ b/grc/gui/CMakeLists.txt @@ -22,5 +22,4 @@ file(GLOB py_files "*.py") GR_PYTHON_INSTALL( FILES ${py_files} DESTINATION ${GR_PYTHON_DIR}/gnuradio/grc/gui - COMPONENT "grc" ) diff --git a/grc/scripts/CMakeLists.txt b/grc/scripts/CMakeLists.txt index 6cc78c3cf3..9751952118 100644 --- a/grc/scripts/CMakeLists.txt +++ b/grc/scripts/CMakeLists.txt @@ -21,7 +21,6 @@ GR_PYTHON_INSTALL( PROGRAMS gnuradio-companion DESTINATION ${GR_RUNTIME_DIR} - COMPONENT "grc" ) add_subdirectory(freedesktop) diff --git a/grc/scripts/freedesktop/CMakeLists.txt b/grc/scripts/freedesktop/CMakeLists.txt index 47e836f697..f936b366fc 100644 --- a/grc/scripts/freedesktop/CMakeLists.txt +++ b/grc/scripts/freedesktop/CMakeLists.txt @@ -31,7 +31,6 @@ install(FILES gnuradio-grc.xml gnuradio-grc.desktop DESTINATION ${grc_freedesktop_path} - COMPONENT "grc" ) find_program(HAVE_XDG_UTILS xdg-desktop-menu) @@ -44,6 +43,6 @@ if(UNIX AND HAVE_XDG_UTILS) @ONLY) install( PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/grc_setup_freedesktop - DESTINATION ${GR_PKG_LIBEXEC_DIR} COMPONENT "grc" + DESTINATION ${GR_PKG_LIBEXEC_DIR} ) endif(UNIX AND HAVE_XDG_UTILS) |