1 files changed, 9 insertions, 17 deletions
diff --git a/base/test/src/CMakeLists.txt b/base/test/src/CMakeLists.txt
index 3631baa73..5e7c12d64 100644
--- a/base/test/src/CMakeLists.txt
+++ b/base/test/src/CMakeLists.txt
@@ -1,20 +1,12 @@
 project(pki-test_java Java)
 
-# TODO: create CMake function to find all Java files
-set(pki-test_java_SRCS
-    com/netscape/test/TestListener.java
-    com/netscape/test/TestRunner.java
-)
-
-set(CMAKE_JAVA_INCLUDE_PATH
-    ${XALAN_JAR} ${XERCES_JAR} ${JUNIT_JAR}
-)
-
-set(CMAKE_JAVA_TARGET_VERSION ${APPLICATION_VERSION})
-
-# build test jar file
-# TODO: create CMake function to compile without building jar file
+# build pki-test
 # TODO: build test only when the test is invoked
-set(CMAKE_JAR_CLASSES_PREFIX com/netscape)
-add_jar(pki-test ${pki-test_java_SRCS})
-set(PKI_TEST_JAR ${pki-test_JAR_FILE} CACHE INTERNAL "pki-test jar file")
-\ No newline at end of file
+javac(pki-test-classes
+    SOURCES
+        com/netscape/test/*.java
+    CLASSPATH
+        ${XALAN_JAR} ${XERCES_JAR} ${JUNIT_JAR}
+    OUTPUT_DIR
+        ${CMAKE_BINARY_DIR}/test/classes
+)