Merge branch 'dev' of skyjake.fi:gemini/lagrange into dev

2 files changed, 6 insertions, 3 deletions

diff --git a/res/Embed.cmake b/res/Embed.cmake
index fe859dbc..70ac10ed 100644
--- a/res/Embed.cmake
+++ b/res/Embed.cmake
@@ -100,7 +100,7 @@ function (embed_make)
             # Collect resources in a single binary file.
             set (EMB_BIN ${CMAKE_CURRENT_BINARY_DIR}/resources.lgr)
             file (REMOVE ${EMB_BIN})
-            list (LENGTH ARGV fileCount)            
+            list (LENGTH ARGV fileCount)
             execute_process (COMMAND ${BINCAT_COMMAND} ${EMB_BIN} ${ARGV}
                 WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
                 OUTPUT_VARIABLE fileSizes
diff --git a/res/Fontpack.cmake b/res/Fontpack.cmake
index 9471c93d..26d6df1e 100644
--- a/res/Fontpack.cmake
+++ b/res/Fontpack.cmake
@@ -1,15 +1,18 @@
 find_program (ZIP_EXECUTABLE zip DOC "ZIP archiver")
+if (NOT ZIP_EXECUTABLE)
+    message (FATAL_ERROR "Please install 'zip' to create fontpacks.")
+endif ()
 
 function (make_fontpack src)
     get_filename_component (dst ${src} NAME)
     set (fn ${CMAKE_BINARY_DIR}/${dst})
     execute_process (COMMAND ${CMAKE_COMMAND} -E remove ${fn})
     file (GLOB files RELATIVE ${CMAKE_SOURCE_DIR}/${src}
-        ${CMAKE_SOURCE_DIR}/${src}/*        
+        ${CMAKE_SOURCE_DIR}/${src}/*
     )
     message (STATUS "  ${src}")
     execute_process (
-        COMMAND ${ZIP_EXECUTABLE} -0 ${fn} ${files}        
+        COMMAND ${ZIP_EXECUTABLE} -0 ${fn} ${files}
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/${src}
         OUTPUT_QUIET
     )