commit ccc0969dd97ed55b063f79fc2b85011e48b765ca
author DRC <dcommander@users.sourceforge.net> Tue Nov 08 06:57:58 2011 +0000
committer DRC <dcommander@users.sourceforge.net> Tue Nov 08 06:57:58 2011 +0000
tree 908b4b88b2d3253bb207925944e9e5cba99d7a16
parent c6c436e9faaca220a0b58027badf08a0907e3589

Remove Visual C++ support


git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4774 3789f03b-4d11-0410-bbf8-ca57d06f2519

java/CMakeLists.txt

diff --git a/java/CMakeLists.txt b/java/CMakeLists.txt
index 4010aa6..9a8a612 100644
--- a/java/CMakeLists.txt
+++ b/java/CMakeLists.txt
@@ -14,15 +14,8 @@
 set(JAVA_SRCDIR ${CMAKE_CURRENT_SOURCE_DIR}/${CLASSPATH})
 set(JAVA_BINDIR ${CMAKE_CURRENT_BINARY_DIR}/${CLASSPATH})
 
-if(MSVC)
-  execute_process(COMMAND "${CMAKE_SOURCE_DIR}/cmake/getdate.bat" "javadate"
-    OUTPUT_VARIABLE JAVA_DATE)
-  execute_process(COMMAND "${CMAKE_SOURCE_DIR}/cmake/getdate.bat" "javatime"
-    OUTPUT_VARIABLE JAVA_TIME)
-else()
-  execute_process(COMMAND "date" "+%b %d %Y" OUTPUT_VARIABLE JAVA_DATE)
-  execute_process(COMMAND "date" "+%H:%M:%S" OUTPUT_VARIABLE JAVA_TIME)
-endif()
+execute_process(COMMAND "date" "+%b %d %Y" OUTPUT_VARIABLE JAVA_DATE)
+execute_process(COMMAND "date" "+%H:%M:%S" OUTPUT_VARIABLE JAVA_TIME)
 string(REGEX REPLACE "\n" "" JAVA_DATE ${JAVA_DATE})
 string(REGEX REPLACE "\n" "" JAVA_TIME ${JAVA_TIME})
 
@@ -40,18 +33,12 @@
   UserPrefs
   VncViewer)
 
-if(MSVC_IDE)
-  set(OBJDIR "${CMAKE_CURRENT_BINARY_DIR}/$(OutDir)")
-else()
-  set(OBJDIR ${CMAKE_CURRENT_BINARY_DIR})
-endif()
-
 set(JAVA_SOURCES "")
 set(JAVA_CLASSES_FULL "")
 foreach(class ${JAVA_CLASSNAMES})
   set(JAVA_SOURCES ${JAVA_SOURCES} ${JAVA_SRCDIR}/${class}.java)
   set(JAVA_CLASSES_FULL ${JAVA_CLASSES_FULL}
-    ${OBJDIR}/${CLASSPATH}/${class}.class)
+    ${CMAKE_CURRENT_BINARY_DIR}/${CLASSPATH}/${class}.class)
 endforeach()
 
 file(GLOB DEPEND_SOURCES
@@ -63,7 +50,8 @@
 add_custom_command(OUTPUT ${JAVA_CLASSES_FULL}
   DEPENDS ${JAVA_SOURCES} ${DEPEND_SOURCES}
   COMMAND ${JAVA_COMPILE}
-  ARGS ${JAVACFLAGS} -cp ${CMAKE_CURRENT_SOURCE_DIR} -d ${OBJDIR} ${JAVA_SOURCES})
+  ARGS ${JAVACFLAGS} -cp ${CMAKE_CURRENT_SOURCE_DIR}
+    -d ${CMAKE_CURRENT_BINARY_DIR} ${JAVA_SOURCES})
 
 configure_file(${CLASSPATH}/timestamp.in ${CLASSPATH}/timestamp)
 
@@ -99,8 +87,7 @@
   COMMAND ${CMAKE_COMMAND}
   ARGS -DJava_PATH=${Java_PATH}
     -DJAR_FILE=${CMAKE_CURRENT_BINARY_DIR}/VncViewer.jar
-    -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/SignJar.cmake
-  WORKING_DIRECTORY ${OBJDIR})
+    -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/SignJar.cmake)
 
 add_custom_target(java ALL DEPENDS VncViewer.jar)