pub_soft/rdkit
3
0
Fork 0
mirror of https://github.com/rdkit/rdkit.git synced 2026-06-04 21:54:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

this works for java8, but not java6. Need java version detection

Browse Source
This commit is contained in:
Greg Landrum
2015-11-19 08:34:33 +01:00
parent 26622c92d8
commit 678e771a71
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Code/JavaWrappers/gmwrapper/CMakeLists.txt
View File

@@ -25,6 +25,9 @@ endif (NOT JAVADOC_EXE)
INCLUDE_DIRECTORIES(${JNI_INCLUDE_DIRS})
# java8 raises errors while creating the documentation
SET(DOCLINT_FLAGS "-Xdoclint:none")
SET_SOURCE_FILES_PROPERTIES(GraphMolJava.i PROPERTIES CPLUSPLUS ON )
FILE(TO_NATIVE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../*.java COPY_SOURCE)
@@ -108,10 +111,10 @@ ADD_CUSTOM_COMMAND(
OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/org.RDKitDoc.jar
## Run Javadoc against newly created .java files to create docs
COMMAND ${JAVADOC_EXE} -tag notes -tag example -d ${CMAKE_CURRENT_SOURCE_DIR}/doc -sourcepath ${CMAKE_CURRENT_SOURCE_DIR}/src org.RDKit
COMMAND ${JAVADOC_EXE} ${DOCLINT_FLAGS} -tag notes -tag example -d ${CMAKE_CURRENT_SOURCE_DIR}/doc -sourcepath ${CMAKE_CURRENT_SOURCE_DIR}/src org.RDKit
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
## Put the doc files into their own separate archive.
COMMAND ${JAVA_ARCHIVE} cf
COMMAND ${JAVA_ARCHIVE} cf ${DOCLINT_FLAGS}
${CMAKE_CURRENT_SOURCE_DIR}/org.RDKitDoc.jar
doc
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
@@ -140,7 +143,7 @@ endif()
ADD_CUSTOM_COMMAND(
OUTPUT ${CMAKE_JAVA_TEST_OUTDIR}/org/RDKit/WrapperTests.class
COMMAND ${JAVA_COMPILE} -d ${CMAKE_JAVA_TEST_OUTDIR} -cp "${CMAKE_CURRENT_SOURCE_DIR}/org.RDKit.jar${PATH_SEP}${JUNIT_JAR}" ${JAVA_TEST_FILES}
COMMAND ${JAVA_COMPILE} ${DOCLINT_FLAGS} -d ${CMAKE_JAVA_TEST_OUTDIR} -cp "${CMAKE_CURRENT_SOURCE_DIR}/org.RDKit.jar${PATH_SEP}${JUNIT_JAR}" ${JAVA_TEST_FILES}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/org.RDKit.jar ${JAVA_TEST_FILES}
)