Skip to content

Commit

Permalink
avoid conflict between cmake and ant by moving ant temp directory to …
Browse files Browse the repository at this point in the history
…jbuild
  • Loading branch information
carltimmer committed Apr 4, 2022
1 parent 7d8053d commit 629f010
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ cmake-*
cmake_install.cmake
coda.pyc
build/
jbuild/
doxyerrors.log
/target/
doc/javadoc
Expand Down
2 changes: 1 addition & 1 deletion build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<!-- Directories/Files -->
<property name="src.dir" value="java" />
<property name="build.dir" value="build" />
<property name="build.dir" value="jbuild" />
<property name="build.classes" value="${build.dir}/classes" />
<property name="build.lib" value="${build.dir}/lib" />
<property name="doc.dir" value="doc/javadoc" />
Expand Down

0 comments on commit 629f010

Please sign in to comment.