From d748c0816aba76d854407bb57011800e45bc5506 Mon Sep 17 00:00:00 2001
From: Leland Lucius <github@homerow.net>
Date: Sun, 23 Feb 2020 16:46:30 -0600
Subject: [PATCH] Actually do what the previous change said

Forgot to actually exclude mod-null and mod-nyq-bench from the
build.

Fixed a few typos.

And removed "zip" from the package install on Ubuntu since it's
not needed anymore.
---
 .github/workflows/cmake_build.yml            | 2 +-
 cmake-proxies/mod-null/CMakeLists.txt        | 4 ++--
 cmake-proxies/mod-nyq-bench/CMakeLists.txt   | 4 ++--
 cmake-proxies/mod-script-pipe/CMakeLists.txt | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/cmake_build.yml b/.github/workflows/cmake_build.yml
index c0dd086d7..35c8915d4 100644
--- a/.github/workflows/cmake_build.yml
+++ b/.github/workflows/cmake_build.yml
@@ -249,7 +249,7 @@ jobs:
         export LD_LIBRARY_PATH="/usr/local/lib"
 
         # Install required packages
-        sudo apt-get install -y libgtk2.0-dev libasound2-dev gettext zip
+        sudo apt-get install -y libgtk2.0-dev libasound2-dev gettext
         sudo apt-get remove -y ccache
 
         # Build wxWidgets if needed
diff --git a/cmake-proxies/mod-null/CMakeLists.txt b/cmake-proxies/mod-null/CMakeLists.txt
index bb9b1e417..61b6a9ffb 100644
--- a/cmake-proxies/mod-null/CMakeLists.txt
+++ b/cmake-proxies/mod-null/CMakeLists.txt
@@ -6,7 +6,7 @@ message( STATUS "========== Configuring ${TARGET} ==========" )
 
 def_vars()
 
-add_library( ${TARGET} MODULE )
+add_library( ${TARGET} MODULE EXCLUDE_FROM_ALL )
 
 list( APPEND SOURCES
    PRIVATE
@@ -25,7 +25,7 @@ list( APPEND DEFINES
       # the Windows pragmas are removed from ModNullCallback.cpp.
       # Without it, the wxWidgets "debug.h" will define __WXDEBUG__
       # which then causes this module to emit library pragmas for the
-      # debug versions of wxWidgets...even if the build if for Release.
+      # debug versions of wxWidgets...even if the build is for Release.
       wxDEBUG_LEVEL=0
 )
 
diff --git a/cmake-proxies/mod-nyq-bench/CMakeLists.txt b/cmake-proxies/mod-nyq-bench/CMakeLists.txt
index 7a6c2972e..3e01b821e 100644
--- a/cmake-proxies/mod-nyq-bench/CMakeLists.txt
+++ b/cmake-proxies/mod-nyq-bench/CMakeLists.txt
@@ -6,7 +6,7 @@ message( STATUS "========== Configuring ${TARGET} ==========" )
 
 def_vars()
 
-add_library( ${TARGET} MODULE )
+add_library( ${TARGET} MODULE EXCLUDE_FROM_ALL )
 
 list( APPEND SOURCES
    PRIVATE
@@ -25,7 +25,7 @@ list( APPEND DEFINES
       # the Windows pragmas are removed from NyqBench.cpp.  Without
       # it, the wxWidgets "debug.h" will define __WXDEBUG__ which
       # then causes this module to emit library pragmas for the debug
-      # versions of wxWidgets...even if the build if for Release.
+      # versions of wxWidgets...even if the build is for Release.
       wxDEBUG_LEVEL=0
 )
 
diff --git a/cmake-proxies/mod-script-pipe/CMakeLists.txt b/cmake-proxies/mod-script-pipe/CMakeLists.txt
index 89690af82..4a680acbd 100644
--- a/cmake-proxies/mod-script-pipe/CMakeLists.txt
+++ b/cmake-proxies/mod-script-pipe/CMakeLists.txt
@@ -27,7 +27,7 @@ list( APPEND DEFINES
       # the Windows pragmas are removed from ScripterCallback.cpp.
       # Without it, the wxWidgets "debug.h" will define __WXDEBUG__
       # which then causes this module to emit library pragmas for the
-      # debug versions of wxWidgets...even if the build if for Release.
+      # debug versions of wxWidgets...even if the build is for Release.
       wxDEBUG_LEVEL=0
 )