aboutsummaryrefslogtreecommitdiffstats
path: root/host/cmake/Modules
diff options
context:
space:
mode:
authorNicholas Corgan <nick.corgan@ettus.com>2013-05-03 10:59:42 -0700
committerNicholas Corgan <nick.corgan@ettus.com>2013-05-03 10:59:42 -0700
commit265daa586730b95d803a694548479cb790ea80fd (patch)
tree89de1997725442d60ec76c5bce44c4c63bcabaae /host/cmake/Modules
parent429435d35416cc7b7d788afdd78bed50ff75e04c (diff)
parentb0a4e2ad081cc55ad309d44b59583f0140f87608 (diff)
downloaduhd-265daa586730b95d803a694548479cb790ea80fd.tar.gz
uhd-265daa586730b95d803a694548479cb790ea80fd.tar.bz2
uhd-265daa586730b95d803a694548479cb790ea80fd.zip
Merge branch 'maint'
Diffstat (limited to 'host/cmake/Modules')
-rw-r--r--host/cmake/Modules/FindGZip.cmake21
-rw-r--r--host/cmake/Modules/UHDPackage.cmake4
2 files changed, 25 insertions, 0 deletions
diff --git a/host/cmake/Modules/FindGZip.cmake b/host/cmake/Modules/FindGZip.cmake
new file mode 100644
index 000000000..05fe26b4c
--- /dev/null
+++ b/host/cmake/Modules/FindGZip.cmake
@@ -0,0 +1,21 @@
+#
+# Copyright 2013 Ettus Research LLC
+#
+# This program 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 of the License, or
+# (at your option) any later version.
+#
+# This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
+#
+
+########################################################################
+FIND_PROGRAM(GZIP_EXECUTABLE NAMES gzip)
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GZip DEFAULT_MSG GZIP_EXECUTABLE)
diff --git a/host/cmake/Modules/UHDPackage.cmake b/host/cmake/Modules/UHDPackage.cmake
index ae11c5042..1f1d266e2 100644
--- a/host/cmake/Modules/UHDPackage.cmake
+++ b/host/cmake/Modules/UHDPackage.cmake
@@ -152,6 +152,10 @@ FOREACH(filename preinst postinst prerm postrm)
${CMAKE_BINARY_DIR}/debian/${filename}
@ONLY)
ENDFOREACH(filename)
+CONFIGURE_FILE(
+ ${CMAKE_SOURCE_DIR}/cmake/debian/watch
+ ${CMAKE_BINARY_DIR}/debian/watch
+@ONLY)
########################################################################
# Setup CPack RPM