diff options
| author | DRC <dcommander@users.sourceforge.net> | 2011-10-04 04:03:34 +0000 |
|---|---|---|
| committer | DRC <dcommander@users.sourceforge.net> | 2011-10-04 04:03:34 +0000 |
| commit | 7636ad0cc4186ec01827696426a03cca914ce57b (patch) | |
| tree | abb0fc645f97a272545cfdb06262d2ccd09a0331 /cmake | |
| parent | e334a8aa00789c720aa70694fe2e134a65deda12 (diff) | |
| download | tigervnc-7636ad0cc4186ec01827696426a03cca914ce57b.tar.gz tigervnc-7636ad0cc4186ec01827696426a03cca914ce57b.zip | |
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
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/BuildPackages.cmake | 9 | ||||
| -rw-r--r-- | cmake/getdate.bat | 6 |
2 files changed, 13 insertions, 2 deletions
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 |