From accb9f2fe8fd8f6a1e114adac5b15304b0e0012d Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Wed, 20 Jul 2011 19:04:32 -0700 Subject: gr: squashed cmakelists.txt into one commit --- grc/CMakeLists.txt | 118 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 118 insertions(+) create mode 100644 grc/CMakeLists.txt (limited to 'grc/CMakeLists.txt') diff --git a/grc/CMakeLists.txt b/grc/CMakeLists.txt new file mode 100644 index 000000000..ee422a4da --- /dev/null +++ b/grc/CMakeLists.txt @@ -0,0 +1,118 @@ +# 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. + +######################################################################## +# Setup dependencies +######################################################################## +INCLUDE(GrPython) + +GR_PYTHON_CHECK_MODULE("python >= 2.5" sys "sys.version.split()[0] >= '2.5'" PYTHON_MIN_VER_FOUND) +GR_PYTHON_CHECK_MODULE("Cheetah >= 2.0.0" Cheetah "Cheetah.Version >= '2.0.0'" CHEETAH_FOUND) +GR_PYTHON_CHECK_MODULE("lxml >= 1.3.6" lxml.etree "lxml.etree.LXML_VERSION >= (1, 3, 6, 0)" LXML_FOUND) +GR_PYTHON_CHECK_MODULE("pygtk >= 2.10.0" gtk "gtk.pygtk_version >= (2, 10, 0)" PYGTK_FOUND) +GR_PYTHON_CHECK_MODULE("numpy" numpy True NUMPY_FOUND) + +######################################################################## +# Register component +######################################################################## +INCLUDE(GrComponent) +GR_REGISTER_COMPONENT("gnuradio-companion" ENABLE_GRC + ENABLE_GR_CORE_ + ENABLE_PYTHON_ + PYTHON_MIN_VER_FOUND + CHEETAH_FOUND + LXML_FOUND + PYGTK_FOUND + NUMPY_FOUND +) + +######################################################################## +# Begin conditional configuration +######################################################################## +IF(ENABLE_GRC) + +######################################################################## +# Setup CPack components +######################################################################## +INCLUDE(GrPackage) +CPACK_COMPONENT("grc" + DISPLAY_NAME "GNU Radio Companion" + DESCRIPTION "Graphical flow graph designer" + DEPENDS "core_python" +) + +######################################################################## +# Create and install the grc conf file +######################################################################## +FILE(TO_NATIVE_PATH ${CMAKE_INSTALL_PREFIX}/${GR_PKG_DOC_DIR} docdir) +FILE(TO_NATIVE_PATH ${CMAKE_INSTALL_PREFIX}/${GRC_BLOCKS_DIR} blocksdir) + +CONFIGURE_FILE( + ${CMAKE_CURRENT_SOURCE_DIR}/grc.conf.in + ${CMAKE_CURRENT_BINARY_DIR}/grc.conf +@ONLY) + +INSTALL( + FILES ${CMAKE_CURRENT_BINARY_DIR}/grc.conf + DESTINATION ${GR_PKG_CONF_DIR} + COMPONENT "grc" +) + +GR_PYTHON_INSTALL( + FILES __init__.py + DESTINATION ${GR_PYTHON_DIR}/gnuradio/grc + COMPONENT "grc" +) + +######################################################################## +# Appens NSIS commands to set environment variables +######################################################################## +FILE(TO_NATIVE_PATH ${GR_PKG_DOC_DIR} GR_DOC_DIR) +STRING(REPLACE "\\" "\\\\" GR_DOC_DIR ${GR_DOC_DIR}) + +FILE(TO_NATIVE_PATH ${GRC_BLOCKS_DIR} GRC_BLOCKS_PATH) +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} + WriteRegStr HKLM ${HLKM_ENV} \\\"GR_DOC_DIR\\\" \\\"$INSTDIR\\\\${GR_DOC_DIR}\\\" + WriteRegStr HKLM ${HLKM_ENV} \\\"GRC_BLOCKS_PATH\\\" \\\"$INSTDIR\\\\${GRC_BLOCKS_PATH}\\\" + WriteRegStr HKLM \\\"SOFTWARE\\\\Python\\\\PythonCore\\\\2.7\\\\PythonPath\\\" \\\"gnuradio\\\" \\\"$INSTDIR\\\\${GR_PYTHON_POSTFIX}\\\" +") + +CPACK_SET(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "${CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS} + DeleteRegValue HKLM ${HLKM_ENV} \\\"GR_DOC_DIR\\\" + DeleteRegValue HKLM ${HLKM_ENV} \\\"GRC_BLOCKS_PATH\\\" + DeleteRegValue HKLM \\\"SOFTWARE\\\\Python\\\\PythonCore\\\\2.7\\\\PythonPath\\\" \\\"gnuradio\\\" +") + +######################################################################## +# Add subdirectories +######################################################################## +ADD_SUBDIRECTORY(base) +ADD_SUBDIRECTORY(blocks) +ADD_SUBDIRECTORY(freedesktop) +ADD_SUBDIRECTORY(grc_gnuradio) +ADD_SUBDIRECTORY(gui) +ADD_SUBDIRECTORY(python) +ADD_SUBDIRECTORY(scripts) + +ENDIF(ENABLE_GRC) -- cgit From e12553e7202b2c8a636c99ad3bf53ca288aba17f Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Sat, 13 Aug 2011 09:23:55 -0700 Subject: grc: only perform python checks when not building cross --- grc/CMakeLists.txt | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'grc/CMakeLists.txt') diff --git a/grc/CMakeLists.txt b/grc/CMakeLists.txt index ee422a4da..eec35d27c 100644 --- a/grc/CMakeLists.txt +++ b/grc/CMakeLists.txt @@ -32,14 +32,20 @@ GR_PYTHON_CHECK_MODULE("numpy" numpy True # Register component ######################################################################## INCLUDE(GrComponent) +IF(NOT CMAKE_CROSSCOMPILING) + SET(grc_python_deps + CHEETAH_FOUND + LXML_FOUND + PYGTK_FOUND + NUMPY_FOUND + ) +ENDIF(NOT CMAKE_CROSSCOMPILING) + GR_REGISTER_COMPONENT("gnuradio-companion" ENABLE_GRC ENABLE_GR_CORE_ ENABLE_PYTHON_ PYTHON_MIN_VER_FOUND - CHEETAH_FOUND - LXML_FOUND - PYGTK_FOUND - NUMPY_FOUND + ${grc_python_deps} ) ######################################################################## -- cgit From 71c0f14a46f85027b95f2f5f6d3d219cc9e3783e Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Sat, 8 Oct 2011 17:11:12 -0700 Subject: gr: the CMakeLists.txt took a chill pill --- grc/CMakeLists.txt | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) (limited to 'grc/CMakeLists.txt') diff --git a/grc/CMakeLists.txt b/grc/CMakeLists.txt index eec35d27c..cc7696210 100644 --- a/grc/CMakeLists.txt +++ b/grc/CMakeLists.txt @@ -20,7 +20,7 @@ ######################################################################## # Setup dependencies ######################################################################## -INCLUDE(GrPython) +include(GrPython) GR_PYTHON_CHECK_MODULE("python >= 2.5" sys "sys.version.split()[0] >= '2.5'" PYTHON_MIN_VER_FOUND) GR_PYTHON_CHECK_MODULE("Cheetah >= 2.0.0" Cheetah "Cheetah.Version >= '2.0.0'" CHEETAH_FOUND) @@ -31,15 +31,15 @@ GR_PYTHON_CHECK_MODULE("numpy" numpy True ######################################################################## # Register component ######################################################################## -INCLUDE(GrComponent) -IF(NOT CMAKE_CROSSCOMPILING) - SET(grc_python_deps +include(GrComponent) +if(NOT CMAKE_CROSSCOMPILING) + set(grc_python_deps CHEETAH_FOUND LXML_FOUND PYGTK_FOUND NUMPY_FOUND ) -ENDIF(NOT CMAKE_CROSSCOMPILING) +endif(NOT CMAKE_CROSSCOMPILING) GR_REGISTER_COMPONENT("gnuradio-companion" ENABLE_GRC ENABLE_GR_CORE_ @@ -51,12 +51,12 @@ GR_REGISTER_COMPONENT("gnuradio-companion" ENABLE_GRC ######################################################################## # Begin conditional configuration ######################################################################## -IF(ENABLE_GRC) +if(ENABLE_GRC) ######################################################################## # Setup CPack components ######################################################################## -INCLUDE(GrPackage) +include(GrPackage) CPACK_COMPONENT("grc" DISPLAY_NAME "GNU Radio Companion" DESCRIPTION "Graphical flow graph designer" @@ -66,15 +66,15 @@ CPACK_COMPONENT("grc" ######################################################################## # Create and install the grc conf file ######################################################################## -FILE(TO_NATIVE_PATH ${CMAKE_INSTALL_PREFIX}/${GR_PKG_DOC_DIR} docdir) -FILE(TO_NATIVE_PATH ${CMAKE_INSTALL_PREFIX}/${GRC_BLOCKS_DIR} blocksdir) +file(TO_NATIVE_PATH ${CMAKE_INSTALL_PREFIX}/${GR_PKG_DOC_DIR} docdir) +file(TO_NATIVE_PATH ${CMAKE_INSTALL_PREFIX}/${GRC_BLOCKS_DIR} blocksdir) -CONFIGURE_FILE( +configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/grc.conf.in ${CMAKE_CURRENT_BINARY_DIR}/grc.conf @ONLY) -INSTALL( +install( FILES ${CMAKE_CURRENT_BINARY_DIR}/grc.conf DESTINATION ${GR_PKG_CONF_DIR} COMPONENT "grc" @@ -89,14 +89,14 @@ GR_PYTHON_INSTALL( ######################################################################## # Appens NSIS commands to set environment variables ######################################################################## -FILE(TO_NATIVE_PATH ${GR_PKG_DOC_DIR} GR_DOC_DIR) -STRING(REPLACE "\\" "\\\\" GR_DOC_DIR ${GR_DOC_DIR}) +file(TO_NATIVE_PATH ${GR_PKG_DOC_DIR} GR_DOC_DIR) +string(REPLACE "\\" "\\\\" GR_DOC_DIR ${GR_DOC_DIR}) -FILE(TO_NATIVE_PATH ${GRC_BLOCKS_DIR} GRC_BLOCKS_PATH) -STRING(REPLACE "\\" "\\\\" GRC_BLOCKS_PATH ${GRC_BLOCKS_PATH}) +file(TO_NATIVE_PATH ${GRC_BLOCKS_DIR} GRC_BLOCKS_PATH) +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}) +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} WriteRegStr HKLM ${HLKM_ENV} \\\"GR_DOC_DIR\\\" \\\"$INSTDIR\\\\${GR_DOC_DIR}\\\" @@ -113,12 +113,12 @@ CPACK_SET(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "${CPACK_NSIS_EXTRA_UNINSTALL_COMM ######################################################################## # Add subdirectories ######################################################################## -ADD_SUBDIRECTORY(base) -ADD_SUBDIRECTORY(blocks) -ADD_SUBDIRECTORY(freedesktop) -ADD_SUBDIRECTORY(grc_gnuradio) -ADD_SUBDIRECTORY(gui) -ADD_SUBDIRECTORY(python) -ADD_SUBDIRECTORY(scripts) - -ENDIF(ENABLE_GRC) +add_subdirectory(base) +add_subdirectory(blocks) +add_subdirectory(freedesktop) +add_subdirectory(grc_gnuradio) +add_subdirectory(gui) +add_subdirectory(python) +add_subdirectory(scripts) + +endif(ENABLE_GRC) -- cgit From 7ed8b43e654ef613faf39c4298c15180b4114b1d Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Wed, 19 Oct 2011 11:16:25 -0700 Subject: cmake: fix that component depends on component hack --- grc/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'grc/CMakeLists.txt') diff --git a/grc/CMakeLists.txt b/grc/CMakeLists.txt index cc7696210..2f7305cb7 100644 --- a/grc/CMakeLists.txt +++ b/grc/CMakeLists.txt @@ -42,8 +42,8 @@ if(NOT CMAKE_CROSSCOMPILING) endif(NOT CMAKE_CROSSCOMPILING) GR_REGISTER_COMPONENT("gnuradio-companion" ENABLE_GRC - ENABLE_GR_CORE_ - ENABLE_PYTHON_ + ENABLE_GR_CORE + ENABLE_PYTHON PYTHON_MIN_VER_FOUND ${grc_python_deps} ) -- cgit From fb2162069ff725ff430729624605c40cbfaa356b Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Wed, 19 Oct 2011 11:16:52 -0700 Subject: grc: dont set the HLKM stuff unless win32 --- grc/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'grc/CMakeLists.txt') diff --git a/grc/CMakeLists.txt b/grc/CMakeLists.txt index 2f7305cb7..340b8794c 100644 --- a/grc/CMakeLists.txt +++ b/grc/CMakeLists.txt @@ -89,6 +89,8 @@ GR_PYTHON_INSTALL( ######################################################################## # Appens NSIS commands to set environment variables ######################################################################## +if(WIN32) + file(TO_NATIVE_PATH ${GR_PKG_DOC_DIR} GR_DOC_DIR) string(REPLACE "\\" "\\\\" GR_DOC_DIR ${GR_DOC_DIR}) @@ -110,6 +112,8 @@ CPACK_SET(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "${CPACK_NSIS_EXTRA_UNINSTALL_COMM DeleteRegValue HKLM \\\"SOFTWARE\\\\Python\\\\PythonCore\\\\2.7\\\\PythonPath\\\" \\\"gnuradio\\\" ") +endif(WIN32) + ######################################################################## # Add subdirectories ######################################################################## -- cgit From 9b58dc91c0bf5a87128a24d8e22a8e19aa974c9f Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Sat, 22 Oct 2011 13:29:44 -0700 Subject: cmake: make python checks optional for cross builds --- grc/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'grc/CMakeLists.txt') diff --git a/grc/CMakeLists.txt b/grc/CMakeLists.txt index 340b8794c..2d108ab4d 100644 --- a/grc/CMakeLists.txt +++ b/grc/CMakeLists.txt @@ -34,6 +34,7 @@ GR_PYTHON_CHECK_MODULE("numpy" numpy True include(GrComponent) if(NOT CMAKE_CROSSCOMPILING) set(grc_python_deps + PYTHON_MIN_VER_FOUND CHEETAH_FOUND LXML_FOUND PYGTK_FOUND @@ -44,7 +45,6 @@ endif(NOT CMAKE_CROSSCOMPILING) GR_REGISTER_COMPONENT("gnuradio-companion" ENABLE_GRC ENABLE_GR_CORE ENABLE_PYTHON - PYTHON_MIN_VER_FOUND ${grc_python_deps} ) -- cgit From 7b57dae20bb182561fcda78e5eeec44e44f0a9fb Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Thu, 17 Nov 2011 07:59:50 -0800 Subject: grc: replaced doxygen extracted docs with python docstrings --- grc/CMakeLists.txt | 3 --- 1 file changed, 3 deletions(-) (limited to 'grc/CMakeLists.txt') diff --git a/grc/CMakeLists.txt b/grc/CMakeLists.txt index 2d108ab4d..997aa56b1 100644 --- a/grc/CMakeLists.txt +++ b/grc/CMakeLists.txt @@ -66,7 +66,6 @@ CPACK_COMPONENT("grc" ######################################################################## # Create and install the grc conf file ######################################################################## -file(TO_NATIVE_PATH ${CMAKE_INSTALL_PREFIX}/${GR_PKG_DOC_DIR} docdir) file(TO_NATIVE_PATH ${CMAKE_INSTALL_PREFIX}/${GRC_BLOCKS_DIR} blocksdir) configure_file( @@ -101,13 +100,11 @@ 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} - WriteRegStr HKLM ${HLKM_ENV} \\\"GR_DOC_DIR\\\" \\\"$INSTDIR\\\\${GR_DOC_DIR}\\\" WriteRegStr HKLM ${HLKM_ENV} \\\"GRC_BLOCKS_PATH\\\" \\\"$INSTDIR\\\\${GRC_BLOCKS_PATH}\\\" WriteRegStr HKLM \\\"SOFTWARE\\\\Python\\\\PythonCore\\\\2.7\\\\PythonPath\\\" \\\"gnuradio\\\" \\\"$INSTDIR\\\\${GR_PYTHON_POSTFIX}\\\" ") CPACK_SET(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "${CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS} - DeleteRegValue HKLM ${HLKM_ENV} \\\"GR_DOC_DIR\\\" DeleteRegValue HKLM ${HLKM_ENV} \\\"GRC_BLOCKS_PATH\\\" DeleteRegValue HKLM \\\"SOFTWARE\\\\Python\\\\PythonCore\\\\2.7\\\\PythonPath\\\" \\\"gnuradio\\\" ") -- cgit From faab807cf5e8b4a4c950d1fd8ae6672296fb1ad9 Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Tue, 3 Apr 2012 18:21:52 -0400 Subject: Rework example directories. Gets rid of gnuradio-examples, moves these to more appropriate components. gnuradio-core and grc now have their own examples directories for files directly related to them. --- grc/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'grc/CMakeLists.txt') diff --git a/grc/CMakeLists.txt b/grc/CMakeLists.txt index 997aa56b1..8be5d7fbc 100644 --- a/grc/CMakeLists.txt +++ b/grc/CMakeLists.txt @@ -121,5 +121,6 @@ add_subdirectory(grc_gnuradio) add_subdirectory(gui) add_subdirectory(python) add_subdirectory(scripts) +add_subdirectory(examples) endif(ENABLE_GRC) -- cgit From f919f9dcbb54a08e6e26d6c229ce92fb784fa1b2 Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Fri, 13 Apr 2012 18:36:53 -0400 Subject: Removed whitespace and added dtools/bin/remove-whitespace as a tool to do this in the future. The sed script was provided by Moritz Fischer. --- grc/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'grc/CMakeLists.txt') diff --git a/grc/CMakeLists.txt b/grc/CMakeLists.txt index 8be5d7fbc..f54aa4f80 100644 --- a/grc/CMakeLists.txt +++ b/grc/CMakeLists.txt @@ -1,17 +1,17 @@ # 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, -- cgit From 9b2855a4d868731a2d4a1eb03b12d5c930c5c6d0 Mon Sep 17 00:00:00 2001 From: Chí-Thanh Christopher Nguyễn Date: Sat, 16 Jun 2012 17:34:19 -0400 Subject: cmake: add support for SYSCONFDIR Set with 'cmake -DSYSCONFDIR=target ...' This fixes http://gnuradio.org/redmine/issues/492 --- grc/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'grc/CMakeLists.txt') diff --git a/grc/CMakeLists.txt b/grc/CMakeLists.txt index f54aa4f80..219bbe164 100644 --- a/grc/CMakeLists.txt +++ b/grc/CMakeLists.txt @@ -75,7 +75,7 @@ configure_file( install( FILES ${CMAKE_CURRENT_BINARY_DIR}/grc.conf - DESTINATION ${GR_PKG_CONF_DIR} + DESTINATION ${GR_PREFSDIR} COMPONENT "grc" ) -- cgit From 2190f94d08855676a1f837c4520831d3987d1148 Mon Sep 17 00:00:00 2001 From: Nicholas Corgan Date: Tue, 15 Jan 2013 16:22:25 -0800 Subject: grc: fixed problem of GRC_BLOCKS_PATH not being set in Windows --- grc/CMakeLists.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'grc/CMakeLists.txt') diff --git a/grc/CMakeLists.txt b/grc/CMakeLists.txt index 219bbe164..1156f1d76 100644 --- a/grc/CMakeLists.txt +++ b/grc/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2011 Free Software Foundation, Inc. +# Copyright 2011,2013 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -100,13 +100,15 @@ 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}\\\" - WriteRegStr HKLM \\\"SOFTWARE\\\\Python\\\\PythonCore\\\\2.7\\\\PythonPath\\\" \\\"gnuradio\\\" \\\"$INSTDIR\\\\${GR_PYTHON_POSTFIX}\\\" + 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\\\" - DeleteRegValue HKLM \\\"SOFTWARE\\\\Python\\\\PythonCore\\\\2.7\\\\PythonPath\\\" \\\"gnuradio\\\" + SendMessage \\\${HWND_BROADCAST} \\\${WM_WININICHANGE} 0 \\\"STR:Environment\\\" /TIMEOUT=5000 ") endif(WIN32) -- cgit