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
diff --git a/cmake/BuildPackages.cmake b/cmake/BuildPackages.cmake
index 1e3dd42..100ba05 100644
--- a/cmake/BuildPackages.cmake
+++ b/cmake/BuildPackages.cmake
@@ -77,12 +77,17 @@
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 b4251bb..09956ba 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