From kde-commits  Thu May 29 06:00:50 2008
From: Jos van den Oever <jos () vandenoever ! info>
Date: Thu, 29 May 2008 06:00:50 +0000
To: kde-commits
Subject: kdesupport/strigi/src/xsd
Message-Id: <1212040850.673620.27395.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=121204091812813

SVN commit 814016 by vandenoever:

Do not allow the use of gcj. It is incomplete and does not work for our purposes.

 M  +4 -4      CMakeLists.txt  


--- trunk/kdesupport/strigi/src/xsd/CMakeLists.txt #814015:814016
@@ -25,11 +25,11 @@
 find_package(Java)
 if (JAVA_COMPILE)
   execute_process(COMMAND ${JAVA_COMPILE} "-version" ERROR_VARIABLE
-    JAVAC_VERSION_STRING)
-  string(REGEX MATCH " 1\\.[56]" JAVAC_VERSION "${JAVAC_VERSION_STRING}")
-  if (JAVAC_VERSION)
+    JAVAC_VERSION)
+  if (JAVAC_VERSION MATCHES " 1\\.[56]" AND NOT JAVAC_VERSION MATCHES "g[ci]j")
     set(JAVAC5_FOUND TRUE)
-  endif (JAVAC_VERSION)
+  endif (JAVAC_VERSION MATCHES " 1\\.[56]" AND NOT JAVAC_VERSION MATCHES "g[ci]j")
+  MESSAGE("Java5 found ${JAVAC5_FOUND}")
 endif (JAVA_COMPILE)
 
 # loop over all xsd files