Commit 3a132503 authored by Christopher Bruns's avatar Christopher Bruns
Browse files

Corrected CMakelists.txt error; GCCXML_PATH actually needs to be a FILEPATH, not a PATH

Better search for svnversion.exe on Windows
parent 2e1f2f65
...@@ -109,7 +109,9 @@ SET(OPENMM_AUTHORS "Peter.Eastman") ...@@ -109,7 +109,9 @@ SET(OPENMM_AUTHORS "Peter.Eastman")
# Cygwin, and your "about" string will say "unknown" rather than # Cygwin, and your "about" string will say "unknown" rather than
# providing the SVN version of the source. # providing the SVN version of the source.
FIND_PROGRAM (SVNVERSION_EXE svnversion.exe) FIND_PROGRAM (SVNVERSION_EXE svnversion.exe
PATHS "C:/cygwin/bin"
)
IF (SVNVERSION_EXE) IF (SVNVERSION_EXE)
EXEC_PROGRAM (${SVNVERSION_EXE} EXEC_PROGRAM (${SVNVERSION_EXE}
ARGS \"${CMAKE_CURRENT_SOURCE_DIR}\" ARGS \"${CMAKE_CURRENT_SOURCE_DIR}\"
......
...@@ -5,7 +5,7 @@ FOREACH(subdir ${API_INCLUDE_DIRS}) ...@@ -5,7 +5,7 @@ FOREACH(subdir ${API_INCLUDE_DIRS})
SET(GCCXML_ARGS ${GCCXML_ARGS} -I${subdir}) SET(GCCXML_ARGS ${GCCXML_ARGS} -I${subdir})
ENDFOREACH(subdir) ENDFOREACH(subdir)
SET(GCCXML_PATH "/usr/local/bin/gccxml" CACHE PATH "Path to the gccxml executable") SET(GCCXML_PATH "/usr/local/bin/gccxml" CACHE FILEPATH "Path to the gccxml executable")
ADD_CUSTOM_COMMAND(OUTPUT OpenMMApi.xml COMMAND ${GCCXML_PATH} ${GCCXML_ARGS} ${CMAKE_SOURCE_DIR}/openmmapi/include/OpenMM.h -fxml=OpenMMApi.xml) ADD_CUSTOM_COMMAND(OUTPUT OpenMMApi.xml COMMAND ${GCCXML_PATH} ${GCCXML_ARGS} ${CMAKE_SOURCE_DIR}/openmmapi/include/OpenMM.h -fxml=OpenMMApi.xml)
ADD_CUSTOM_COMMAND(OUTPUT OpenMMCWrapper.h COMMAND ${JAVA_RUNTIME} -jar ${CMAKE_SOURCE_DIR}/wrappers/saxonb9-1-0-7j/saxon9.jar -t -s:OpenMMApi.xml ADD_CUSTOM_COMMAND(OUTPUT OpenMMCWrapper.h COMMAND ${JAVA_RUNTIME} -jar ${CMAKE_SOURCE_DIR}/wrappers/saxonb9-1-0-7j/saxon9.jar -t -s:OpenMMApi.xml
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment