depend on jar automatically

Author: bear101

Library/TeamTalkJNI/CMakeLists.txt

@@ -233,69 +233,56 @@ if (Java_FOUND)
       DOWNLOAD_NAME       junit-platform-console-standalone.jar
       UPDATE_COMMAND      ""
       INSTALL_COMMAND     ""
+      BUILD_BYPRODUCTS    ${CMAKE_CURRENT_LIST_DIR}/libs/junit-platform-console-standalone.jar
       INSTALL_DIR         ""
       CONFIGURE_COMMAND   ""
       BUILD_COMMAND       ${CMAKE_COMMAND} -E copy <DOWNLOAD_DIR>/junit-platform-console-standalone.jar ${CMAKE_CURRENT_LIST_DIR}/libs/junit-platform-console-standalone.jar
       )
-
-    ExternalProject_Get_Property(junit-platform-console-standalone DOWNLOAD_DIR)
-    set (junit-platform-console-standalone-jar ${CMAKE_CURRENT_LIST_DIR}/libs/junit-platform-console-standalone.jar)
-    set (junit-jars ${junit-platform-console-standalone-jar})
+    set (junit-jars ${CMAKE_CURRENT_LIST_DIR}/libs/junit-platform-console-standalone.jar)
   else()
     find_jar (junit-platform-console-standalone NAMES junit-platform-console-standalone
       PATHS ENV JUNIT_HOME
       DOC "Find JUnit Platform Console Standalone")
     set (junit-jars ${junit-platform-console-standalone})
   endif()
 
-  if (NOT junit-platform-console-standalone)
-    message(WARNING "Cannot find JUnit 5 jars. Skipping JUnit tests.")
-  else()
-    if (BUILD_TEAMTALK_LIBRARY_JAR)
-      add_jar (TeamTalk5Test INCLUDE_JARS TeamTalk5JAR ${junit-jars}
-        ENTRY_POINT org/junit/platform/console/ConsoleLauncher
-        SOURCES test/dk/bearware/TeamTalkTestCase.java
-        test/dk/bearware/TeamTalkTestCaseBase.java
-        test/dk/bearware/TeamTalkStdTestCase.java
-        test/dk/bearware/TestTimingExtension.java
-        test/TeamTalkStdTestSuite.java
-        test/SingleJUnitTestRunner.java
-        test/SummaryTestExecutionListener.java
-        OUTPUT_DIR libs)
-      if (MSVC)
-        add_dependencies(TeamTalk5Test junit-platform-console-standalone)
-      endif()
-      install (FILES ${CMAKE_CURRENT_LIST_DIR}/libs/TeamTalk5Test.jar DESTINATION Library/TeamTalkJNI/libs)
-    endif()
-
-    if (BUILD_TEAMTALK_LIBRARY_JARPRO)
-      add_jar (TeamTalk5ProTest INCLUDE_JARS TeamTalk5ProJAR ${junit-jars}
-        ENTRY_POINT org/junit/platform/console/ConsoleLauncher
-        SOURCES test/dk/bearware/TeamTalkTestCase.java
-        test/dk/bearware/TeamTalkTestCaseBase.java
-        test/dk/bearware/TeamTalkProTestCase.java
-        test/dk/bearware/TestTimingExtension.java
-        test/TeamTalkProTestSuite.java
-        test/SingleJUnitTestRunner.java
-        test/SummaryTestExecutionListener.java
-        OUTPUT_DIR libs)
-      install (FILES ${CMAKE_CURRENT_LIST_DIR}/libs/TeamTalk5ProTest.jar DESTINATION Library/TeamTalkJNI/libs)
-
-      add_jar (TeamTalk5SrvTest INCLUDE_JARS TeamTalk5ProJAR ${junit-jars}
-        ENTRY_POINT org/junit/platform/console/ConsoleLauncher
-        SOURCES test/dk/bearware/TeamTalkTestCaseBase.java
-        test/dk/bearware/TeamTalkServerTestCase.java
-        test/dk/bearware/TestTimingExtension.java
-        test/TeamTalkServerTestSuite.java
-        test/SingleJUnitTestRunner.java
-        test/SummaryTestExecutionListener.java
-        OUTPUT_DIR libs)
-      install (FILES ${CMAKE_CURRENT_LIST_DIR}/libs/TeamTalk5SrvTest.jar DESTINATION Library/TeamTalkJNI/libs)
-
-      if (MSVC)
-        add_dependencies(TeamTalk5ProTest junit-platform-suite)
-        add_dependencies(TeamTalk5SrvTest junit-platform-suite)
-      endif()
-    endif(BUILD_TEAMTALK_LIBRARY_JARPRO)
+  if (BUILD_TEAMTALK_LIBRARY_JAR)
+    add_jar (TeamTalk5Test INCLUDE_JARS TeamTalk5JAR ${junit-jars}
+      ENTRY_POINT org/junit/platform/console/ConsoleLauncher
+      SOURCES test/dk/bearware/TeamTalkTestCase.java
+      test/dk/bearware/TeamTalkTestCaseBase.java
+      test/dk/bearware/TeamTalkStdTestCase.java
+      test/dk/bearware/TestTimingExtension.java
+      test/TeamTalkStdTestSuite.java
+      test/SingleJUnitTestRunner.java
+      test/SummaryTestExecutionListener.java
+      OUTPUT_DIR libs)
+    install (FILES ${CMAKE_CURRENT_LIST_DIR}/libs/TeamTalk5Test.jar DESTINATION Library/TeamTalkJNI/libs)
   endif()
+
+  if (BUILD_TEAMTALK_LIBRARY_JARPRO)
+    add_jar (TeamTalk5ProTest INCLUDE_JARS TeamTalk5ProJAR ${junit-jars}
+      ENTRY_POINT org/junit/platform/console/ConsoleLauncher
+      SOURCES test/dk/bearware/TeamTalkTestCase.java
+      test/dk/bearware/TeamTalkTestCaseBase.java
+      test/dk/bearware/TeamTalkProTestCase.java
+      test/dk/bearware/TestTimingExtension.java
+      test/TeamTalkProTestSuite.java
+      test/SingleJUnitTestRunner.java
+      test/SummaryTestExecutionListener.java
+      OUTPUT_DIR libs)
+    install (FILES ${CMAKE_CURRENT_LIST_DIR}/libs/TeamTalk5ProTest.jar DESTINATION Library/TeamTalkJNI/libs)
+
+    add_jar (TeamTalk5SrvTest INCLUDE_JARS TeamTalk5ProJAR ${junit-jars}
+      ENTRY_POINT org/junit/platform/console/ConsoleLauncher
+      SOURCES test/dk/bearware/TeamTalkTestCaseBase.java
+      test/dk/bearware/TeamTalkServerTestCase.java
+      test/dk/bearware/TestTimingExtension.java
+      test/TeamTalkServerTestSuite.java
+      test/SingleJUnitTestRunner.java
+      test/SummaryTestExecutionListener.java
+      OUTPUT_DIR libs)
+    install (FILES ${CMAKE_CURRENT_LIST_DIR}/libs/TeamTalk5SrvTest.jar DESTINATION Library/TeamTalkJNI/libs)
+
+  endif(BUILD_TEAMTALK_LIBRARY_JARPRO)
 endif()