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 --- gr-wxgui/CMakeLists.txt | 83 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) create mode 100644 gr-wxgui/CMakeLists.txt (limited to 'gr-wxgui/CMakeLists.txt') diff --git a/gr-wxgui/CMakeLists.txt b/gr-wxgui/CMakeLists.txt new file mode 100644 index 000000000..7002ce91b --- /dev/null +++ b/gr-wxgui/CMakeLists.txt @@ -0,0 +1,83 @@ +# 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("wx >= 2.8" wx "wx.version().split()[0] >= '2.8'" WX_FOUND) +GR_PYTHON_CHECK_MODULE("numpy" numpy True NUMPY_FOUND) + +######################################################################## +# Register component +######################################################################## +INCLUDE(GrComponent) +GR_REGISTER_COMPONENT("gr-wxgui" ENABLE_WXGUI + ENABLE_GR_CORE_ + ENABLE_PYTHON_ + NUMPY_FOUND + WX_FOUND +) + +######################################################################## +# Begin conditional configuration +######################################################################## +IF(ENABLE_WXGUI) + +######################################################################## +# Setup CPack components +######################################################################## +INCLUDE(GrPackage) +CPACK_COMPONENT("wxgui" + DISPLAY_NAME "WxGUI" + DESCRIPTION "Wx GUI plotter widgets and grc wrappers" + DEPENDS "core_python" +) + +######################################################################## +# Create Pkg Config File +######################################################################## +CONFIGURE_FILE( + ${CMAKE_CURRENT_SOURCE_DIR}/gr-wxgui.pc.in + ${CMAKE_CURRENT_BINARY_DIR}/gr-wxgui.pc +@ONLY) + +INSTALL( + FILES ${CMAKE_CURRENT_BINARY_DIR}/gr-wxgui.pc + DESTINATION ${GR_LIBRARY_DIR}/pkgconfig + COMPONENT "wxgui" +) + +######################################################################## +# Install the conf file +######################################################################## +INSTALL( + FILES ${CMAKE_CURRENT_SOURCE_DIR}/gr-wxgui.conf + DESTINATION ${GR_PKG_CONF_DIR} + COMPONENT "wxgui" +) + +######################################################################## +# Add subdirectories +######################################################################## +ADD_SUBDIRECTORY(grc) +ADD_SUBDIRECTORY(src/python) + +ENDIF(ENABLE_WXGUI) -- 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 --- gr-wxgui/CMakeLists.txt | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'gr-wxgui/CMakeLists.txt') diff --git a/gr-wxgui/CMakeLists.txt b/gr-wxgui/CMakeLists.txt index 7002ce91b..5bb9c3824 100644 --- a/gr-wxgui/CMakeLists.txt +++ b/gr-wxgui/CMakeLists.txt @@ -20,7 +20,7 @@ ######################################################################## # Setup dependencies ######################################################################## -INCLUDE(GrPython) +include(GrPython) GR_PYTHON_CHECK_MODULE("wx >= 2.8" wx "wx.version().split()[0] >= '2.8'" WX_FOUND) GR_PYTHON_CHECK_MODULE("numpy" numpy True NUMPY_FOUND) @@ -28,7 +28,7 @@ GR_PYTHON_CHECK_MODULE("numpy" numpy True ######################################################################## # Register component ######################################################################## -INCLUDE(GrComponent) +include(GrComponent) GR_REGISTER_COMPONENT("gr-wxgui" ENABLE_WXGUI ENABLE_GR_CORE_ ENABLE_PYTHON_ @@ -39,12 +39,12 @@ GR_REGISTER_COMPONENT("gr-wxgui" ENABLE_WXGUI ######################################################################## # Begin conditional configuration ######################################################################## -IF(ENABLE_WXGUI) +if(ENABLE_WXGUI) ######################################################################## # Setup CPack components ######################################################################## -INCLUDE(GrPackage) +include(GrPackage) CPACK_COMPONENT("wxgui" DISPLAY_NAME "WxGUI" DESCRIPTION "Wx GUI plotter widgets and grc wrappers" @@ -54,12 +54,12 @@ CPACK_COMPONENT("wxgui" ######################################################################## # Create Pkg Config File ######################################################################## -CONFIGURE_FILE( +configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/gr-wxgui.pc.in ${CMAKE_CURRENT_BINARY_DIR}/gr-wxgui.pc @ONLY) -INSTALL( +install( FILES ${CMAKE_CURRENT_BINARY_DIR}/gr-wxgui.pc DESTINATION ${GR_LIBRARY_DIR}/pkgconfig COMPONENT "wxgui" @@ -68,7 +68,7 @@ INSTALL( ######################################################################## # Install the conf file ######################################################################## -INSTALL( +install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/gr-wxgui.conf DESTINATION ${GR_PKG_CONF_DIR} COMPONENT "wxgui" @@ -77,7 +77,7 @@ INSTALL( ######################################################################## # Add subdirectories ######################################################################## -ADD_SUBDIRECTORY(grc) -ADD_SUBDIRECTORY(src/python) +add_subdirectory(grc) +add_subdirectory(src/python) -ENDIF(ENABLE_WXGUI) +endif(ENABLE_WXGUI) -- 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 --- gr-wxgui/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gr-wxgui/CMakeLists.txt') diff --git a/gr-wxgui/CMakeLists.txt b/gr-wxgui/CMakeLists.txt index 5bb9c3824..54fe4fb64 100644 --- a/gr-wxgui/CMakeLists.txt +++ b/gr-wxgui/CMakeLists.txt @@ -30,8 +30,8 @@ GR_PYTHON_CHECK_MODULE("numpy" numpy True ######################################################################## include(GrComponent) GR_REGISTER_COMPONENT("gr-wxgui" ENABLE_WXGUI - ENABLE_GR_CORE_ - ENABLE_PYTHON_ + ENABLE_GR_CORE + ENABLE_PYTHON NUMPY_FOUND WX_FOUND ) -- cgit From f4ed279bba9924bf63b9b883906e7c83887fb3fe Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Thu, 20 Oct 2011 14:40:15 -0700 Subject: utils: added cmake support for the gr-utils --- gr-wxgui/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gr-wxgui/CMakeLists.txt') diff --git a/gr-wxgui/CMakeLists.txt b/gr-wxgui/CMakeLists.txt index 54fe4fb64..5beb39f5e 100644 --- a/gr-wxgui/CMakeLists.txt +++ b/gr-wxgui/CMakeLists.txt @@ -29,7 +29,7 @@ GR_PYTHON_CHECK_MODULE("numpy" numpy True # Register component ######################################################################## include(GrComponent) -GR_REGISTER_COMPONENT("gr-wxgui" ENABLE_WXGUI +GR_REGISTER_COMPONENT("gr-wxgui" ENABLE_GR_WXGUI ENABLE_GR_CORE ENABLE_PYTHON NUMPY_FOUND @@ -39,7 +39,7 @@ GR_REGISTER_COMPONENT("gr-wxgui" ENABLE_WXGUI ######################################################################## # Begin conditional configuration ######################################################################## -if(ENABLE_WXGUI) +if(ENABLE_GR_WXGUI) ######################################################################## # Setup CPack components @@ -80,4 +80,4 @@ install( add_subdirectory(grc) add_subdirectory(src/python) -endif(ENABLE_WXGUI) +endif(ENABLE_GR_WXGUI) -- 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 --- gr-wxgui/CMakeLists.txt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'gr-wxgui/CMakeLists.txt') diff --git a/gr-wxgui/CMakeLists.txt b/gr-wxgui/CMakeLists.txt index 5beb39f5e..7afae785a 100644 --- a/gr-wxgui/CMakeLists.txt +++ b/gr-wxgui/CMakeLists.txt @@ -29,11 +29,17 @@ GR_PYTHON_CHECK_MODULE("numpy" numpy True # Register component ######################################################################## include(GrComponent) +if(NOT CMAKE_CROSSCOMPILING) + set(wxgui_python_deps + NUMPY_FOUND + WX_FOUND + ) +endif(NOT CMAKE_CROSSCOMPILING) + GR_REGISTER_COMPONENT("gr-wxgui" ENABLE_GR_WXGUI ENABLE_GR_CORE ENABLE_PYTHON - NUMPY_FOUND - WX_FOUND + ${wxgui_python_deps} ) ######################################################################## -- 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. --- gr-wxgui/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gr-wxgui/CMakeLists.txt') diff --git a/gr-wxgui/CMakeLists.txt b/gr-wxgui/CMakeLists.txt index 7afae785a..0fc26dee1 100644 --- a/gr-wxgui/CMakeLists.txt +++ b/gr-wxgui/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 --- gr-wxgui/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gr-wxgui/CMakeLists.txt') diff --git a/gr-wxgui/CMakeLists.txt b/gr-wxgui/CMakeLists.txt index 0fc26dee1..8150c7d80 100644 --- a/gr-wxgui/CMakeLists.txt +++ b/gr-wxgui/CMakeLists.txt @@ -76,7 +76,7 @@ install( ######################################################################## install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/gr-wxgui.conf - DESTINATION ${GR_PKG_CONF_DIR} + DESTINATION ${GR_PREFSDIR} COMPONENT "wxgui" ) -- cgit