diff options
| author | DRC <dcommander@users.sourceforge.net> | 2011-10-05 09:29:21 +0000 |
|---|---|---|
| committer | DRC <dcommander@users.sourceforge.net> | 2011-10-05 09:29:21 +0000 |
| commit | f50ec7c5504f708fafd7ee711f6524b327d3c783 (patch) | |
| tree | 6076eabf3890f9fa1999d12e75012b97dd2a0df5 /java | |
| parent | d000252926e7de93c62937df7cf5cd06cde5e8d7 (diff) | |
| download | tigervnc-f50ec7c5504f708fafd7ee711f6524b327d3c783.tar.gz tigervnc-f50ec7c5504f708fafd7ee711f6524b327d3c783.zip | |
Fix WinVNC so that it embeds and serves up the Java viewer whenever BUILD_JAVA=1
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4704 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'java')
| -rw-r--r-- | java/src/CMakeLists.txt | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/java/src/CMakeLists.txt b/java/src/CMakeLists.txt index 7048dd91..a6b4ec8a 100644 --- a/java/src/CMakeLists.txt +++ b/java/src/CMakeLists.txt @@ -73,6 +73,7 @@ add_custom_command(OUTPUT ${JAVA_BINDIR}/tigervnc.ico DEPENDS ${JAVA_SRCDIR}/tigervnc.ico) string(REGEX REPLACE "jar" "" Java_PATH ${Java_JAR_EXECUTABLE}) +string(REGEX REPLACE ".exe" "" Java_PATH ${Java_PATH}) add_custom_command(OUTPUT VncViewer.jar DEPENDS ${JAVA_CLASSES_FULL} @@ -98,8 +99,10 @@ add_custom_command(OUTPUT VncViewer.jar add_custom_target(java ALL DEPENDS VncViewer.jar) -install(FILES - ${CMAKE_CURRENT_BINARY_DIR}/VncViewer.jar - ${JAVA_SRCDIR}/README - ${JAVA_SRCDIR}/index.vnc - DESTINATION vnc/classes) +if(NOT WIN32) + install(FILES + ${CMAKE_CURRENT_BINARY_DIR}/VncViewer.jar + ${JAVA_SRCDIR}/README + ${JAVA_SRCDIR}/index.vnc + DESTINATION vnc/classes) +endif() |