commit 88a4541705c20c937db2d8a269c6a065070343ec
author Brian P. Hinz <bphinz@users.sf.net> Thu Nov 30 21:23:46 2017 -0500
committer Brian P. Hinz <bphinz@users.sf.net> Thu Nov 30 21:24:55 2017 -0500
tree fcf84083bf87014592049193251b723c09b65f0a
parent 9a9f9f0ec170253f43cbf78a33a6b18f148e6259

Display security state when asking for password (java)

java/CMakeLists.txt

diff --git a/java/CMakeLists.txt b/java/CMakeLists.txt
index 7d6c70a..82de6c0 100644
--- a/java/CMakeLists.txt
+++ b/java/CMakeLists.txt
@@ -126,15 +126,18 @@
 
 if(NOT "${SRCDIR}" STREQUAL "${BINDIR}")
 
-add_custom_command(OUTPUT ${BINDIR}/${CLASSPATH}/tigervnc.png
-  COMMAND ${CMAKE_COMMAND} -E copy_if_different
-    ${SRCDIR}/${CLASSPATH}/tigervnc.png ${BINDIR}/${CLASSPATH}/tigervnc.png
-  DEPENDS ${SRCDIR}/${CLASSPATH}/tigervnc.png)
+set(ICONS
+tigervnc.ico
+tigervnc.png
+insecure.png
+secure.png)
 
-add_custom_command(OUTPUT ${BINDIR}/${CLASSPATH}/tigervnc.ico
-  COMMAND ${CMAKE_COMMAND} -E copy_if_different
-    ${SRCDIR}/${CLASSPATH}/tigervnc.ico ${BINDIR}/${CLASSPATH}/tigervnc.ico
-  DEPENDS ${SRCDIR}/${CLASSPATH}/tigervnc.ico)
+foreach(icon ${ICONS})
+  add_custom_command(OUTPUT ${BINDIR}/${CLASSPATH}/${icon}
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different
+      ${SRCDIR}/${CLASSPATH}/${icon} ${BINDIR}/${CLASSPATH}/${icon}
+    DEPENDS ${SRCDIR}/${CLASSPATH}/${icon})
+endforeach()
 
 endif()
 
@@ -145,8 +148,10 @@
   DEPENDS ${JAVA_CLASSES}
     ${SRCDIR}/${CLASSPATH}/MANIFEST.MF
     ${BINDIR}/${CLASSPATH}/timestamp
-    ${BINDIR}/${CLASSPATH}/tigervnc.png
     ${BINDIR}/${CLASSPATH}/tigervnc.ico
+    ${BINDIR}/${CLASSPATH}/tigervnc.png
+    ${BINDIR}/${CLASSPATH}/insecure.png
+    ${BINDIR}/${CLASSPATH}/secure.png
   COMMAND ${JAVA_ARCHIVE}
   ARGS cfm VncViewer.jar
     ${SRCDIR}/${CLASSPATH}/MANIFEST.MF
@@ -159,7 +164,7 @@
     com/jcraft/jsch/jcraft/*.class
     com/jcraft/jsch/jce/*.class
     com/jcraft/jsch/*.class
-    com/tigervnc/vncviewer/tigervnc.png
+    com/tigervnc/vncviewer/*.png
     com/tigervnc/vncviewer/tigervnc.ico
   COMMAND ${CMAKE_COMMAND}
   ARGS -DJava_PATH=${Java_PATH} -DJAR_FILE=${BINDIR}/VncViewer.jar