From 7636ad0cc4186ec01827696426a03cca914ce57b Mon Sep 17 00:00:00 2001
From: DRC <dcommander@users.sourceforge.net>
Date: Tue, 4 Oct 2011 04:03:34 +0000
Subject: Integrate Java TigerVNC Viewer build into CMake build system

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4690 3789f03b-4d11-0410-bbf8-ca57d06f2519
---
 cmake/BuildPackages.cmake | 9 +++++++--
 cmake/getdate.bat         | 6 ++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

(limited to 'cmake')

diff --git a/cmake/BuildPackages.cmake b/cmake/BuildPackages.cmake
index 1e3dd42c..100ba05a 100644
--- a/cmake/BuildPackages.cmake
+++ b/cmake/BuildPackages.cmake
@@ -77,12 +77,17 @@ if(UNIX)
 
 configure_file(release/maketarball.in release/maketarball)
 
+set(TARBALL_DEPENDS vncviewer vncpasswd vncconfig)
+if(BUILD_JAVA)
+  set(TARBALL_DEPENDS ${TARBALL_DEPENDS} java)
+endif()
+
 add_custom_target(tarball sh release/maketarball
-  DEPENDS vncviewer vncpasswd vncconfig
+  DEPENDS ${TARBALL_DEPENDS}
   SOURCES release/maketarball)
 
 add_custom_target(servertarball sh release/maketarball server
-  DEPENDS vncviewer vncpasswd vncconfig
+  DEPENDS ${TARBALL_DEPENDS}
   SOURCES release/maketarball)
 
 endif() #UNIX
diff --git a/cmake/getdate.bat b/cmake/getdate.bat
index b4251bbb..09956baa 100644
--- a/cmake/getdate.bat
+++ b/cmake/getdate.bat
@@ -1,3 +1,9 @@
 @echo off
+
+if "%1"=="javadate" date /t & goto end
+if "%1"=="javatime" time /t & goto end
+
 for /f "tokens=1-4 eol=/ DELIMS=/ " %%i in ('date /t') do set BUILD=%%l%%j%%k
 echo %BUILD%
+
+:end
-- 
cgit v1.2.3