improve SNAP patch and build

- cmake/GetSNAP.cmake: only build the SNAP library; saves a minute of building
	examples.
- cmake/snap-glib.patch: rename from snap-glib-base.patch since fl.cpp is also
	being patched.

Signed-off-by: Aiden Woodruff <woodra@rpi.edu>

2 files changed, 3 insertions, 4 deletions

diff --git a/cmake/GetSNAP.cmake b/cmake/GetSNAP.cmake
index d3e55e2..5ff6293 100644
--- a/cmake/GetSNAP.cmake
+++ b/cmake/GetSNAP.cmake
@@ -2,10 +2,10 @@ find_package(OpenMP REQUIRED)
 
 find_program(PATCH patch)
 if(PATCH)
-        set(SNAP_PATCHCMD ${PATCH} -p1 < "${CMAKE_SOURCE_DIR}/cmake/snap-glib-base.patch")
+        set(SNAP_PATCHCMD ${PATCH} -p1 < "${CMAKE_SOURCE_DIR}/cmake/snap-glib.patch")
 else()
         find_program(GIT git REQUIRED)
-        set(SNAP_PATCHCMD ${GIT} patch apply < "${CMAKE_SOURCE_DIR}/cmake/snap-glib-base.patch")
+        set(SNAP_PATCHCMD ${GIT} patch apply < "${CMAKE_SOURCE_DIR}/cmake/snap-glib.patch")
 endif()
 
 if(CMAKE_SIZEOF_VOID_P EQUAL 4)
@@ -39,8 +39,7 @@ ExternalProject_Add(
         PATCH_COMMAND ${SNAP_PATCHCMD}
         CONFIGURE_COMMAND ""
         BUILD_IN_SOURCE TRUE
-        BUILD_COMMAND make "CXXFLAGS=${SNAP_CXX_FLAGS}"
-        COMMAND make -C snap-core lib
+        BUILD_COMMAND make -C snap-core lib "CXXFLAGS=${SNAP_CXX_FLAGS}"
         BUILD_BYPRODUCTS snap-core/libsnap.a
         INSTALL_COMMAND ""
         LOG_BUILD TRUE
diff --git a/cmake/snap-glib-base.patch b/cmake/snap-glib.patch
index 669f797..669f797 100644
--- a/cmake/snap-glib-base.patch
+++ b/cmake/snap-glib.patch