java: Fix building cvc5.jar for cmake 3.16. (#7623)

Fixes #7579.

diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
index f505a7fb486c4e3fda9eec808cc50427204f676e..e37183f90904ff410261c371a18de06eefd684cf 100644 (file)
--- a/docs/CMakeLists.txt
+++ b/docs/CMakeLists.txt
@@ -16,6 +16,7 @@ find_package(Sphinx REQUIRED)
 check_python_module(breathe)
 check_python_module(sphinxcontrib.bibtex sphinxcontrib-bibtex)
 check_python_module(sphinx_tabs.tabs sphinx-tabs)
+check_python_module(sphinxcontrib.programoutput sphinxcontrib.programoutput)
 
 add_subdirectory(api)
 

diff --git a/docs/api/java/CMakeLists.txt b/docs/api/java/CMakeLists.txt
index 7c897a3549eecc10cb0983bca800cfd0dcca86fc..54a8dc54cf68a778cb631b7a2ee5cd5f2e92dfb5 100644 (file)
--- a/docs/api/java/CMakeLists.txt
+++ b/docs/api/java/CMakeLists.txt
@@ -23,11 +23,9 @@ if(BUILD_BINDINGS_JAVA)
   # used to trigger the rebuild
   set(JAVADOC_INDEX_FILE ${JAVADOC_OUTPUT_DIR}/index.html)
 
-  get_target_property(SOURCES cvc5jar SOURCES)
-  
   add_custom_command(
     OUTPUT "${JAVADOC_INDEX_FILE}"
-    COMMAND 
+    COMMAND
       ${Java_JAVADOC_EXECUTABLE} io.github.cvc5.api
       -sourcepath ${CMAKE_SOURCE_DIR}/src/api/java/
       -d ${JAVADOC_OUTPUT_DIR}
@@ -35,7 +33,7 @@ if(BUILD_BINDINGS_JAVA)
       -notimestamp
     COMMAND find ${JAVADOC_OUTPUT_DIR} -type f -exec sed -i'orig' 's/<!-- Generated by javadoc [^>]* -->//' {} "\;"
     COMMAND find ${SPHINX_GH_OUTPUT_DIR} -name '*orig' -delete
-    DEPENDS cvc5jar ${SOURCES}
+    DEPENDS cvc5jar
     COMMENT "Generating javadocs"
   )
 

diff --git a/src/api/cpp/cvc5.h b/src/api/cpp/cvc5.h
index 5b0cc0b455bc7047e14a5fe94d76c0ff231c0caa..91a6ae4476d368dc2b6f31c7f7553cf0f4b865d9 100644 (file)
--- a/src/api/cpp/cvc5.h
+++ b/src/api/cpp/cvc5.h
@@ -2648,19 +2648,19 @@ enum RoundingMode
   ROUND_NEAREST_TIES_TO_EVEN,
   /**
    * Round towards positive infinity (+oo).
-   * The result shall be the format’s floating-point number (possibly +oo)
+   * The result shall be the format's floating-point number (possibly +oo)
    * closest to and no less than the infinitely precise result.
    */
   ROUND_TOWARD_POSITIVE,
   /**
    * Round towards negative infinity (-oo).
-   * The result shall be the format’s floating-point number (possibly -oo)
+   * The result shall be the format's floating-point number (possibly -oo)
    * closest to and no less than the infinitely precise result.
    */
   ROUND_TOWARD_NEGATIVE,
   /**
    * Round towards zero.
-   * The result shall be the format’s floating-point number closest to and no
+   * The result shall be the format's floating-point number closest to and no
    * greater in magnitude than the infinitely precise result.
    */
   ROUND_TOWARD_ZERO,

diff --git a/src/api/java/CMakeLists.txt b/src/api/java/CMakeLists.txt
index 58f9ee4b55b86ee832afa3b8933fdcd68be1830e..ecfec21099037b63f9ba51b4929594521135b7e4 100644 (file)
--- a/src/api/java/CMakeLists.txt
+++ b/src/api/java/CMakeLists.txt
@@ -140,6 +140,5 @@ add_jar(cvc5jar
   VERSION ${CVC5_VERSION}
   OUTPUT_NAME cvc5
 )
-set_target_properties(cvc5jar PROPERTIES SOURCES "${JAVA_FILES}")
 
 add_dependencies(cvc5jar generate-java-kinds cvc5jni cvc5)

diff --git a/src/api/java/io/github/cvc5/api/RoundingMode.java b/src/api/java/io/github/cvc5/api/RoundingMode.java
index ecc01c342b5dbd3040ec5f1e405bbfa5b07db8c3..6a3c274a14b97a5864047e1a71b091a2b93b901d 100644 (file)
--- a/src/api/java/io/github/cvc5/api/RoundingMode.java
+++ b/src/api/java/io/github/cvc5/api/RoundingMode.java
@@ -25,19 +25,19 @@ public enum RoundingMode {
   ROUND_NEAREST_TIES_TO_EVEN(0),
   /**
    * Round towards positive infinity (+oo).
-   * The result shall be the format’s floating-point number (possibly +oo)
+   * The result shall be the format's floating-point number (possibly +oo)
    * closest to and no less than the infinitely precise result.
    */
   ROUND_TOWARD_POSITIVE(1),
   /**
    * Round towards negative infinity (-oo).
-   * The result shall be the format’s floating-point number (possibly -oo)
+   * The result shall be the format's floating-point number (possibly -oo)
    * closest to and no less than the infinitely precise result.
    */
   ROUND_TOWARD_NEGATIVE(2),
   /**
    * Round towards zero.
-   * The result shall be the format’s floating-point number closest to and no
+   * The result shall be the format's floating-point number closest to and no
    * greater in magnitude than the infinitely precise result.
    */
   ROUND_TOWARD_ZERO(3),