Skip to content

Commit

Permalink
* Set correct default path to javacpp.platform.compiler for Androi…
Browse files Browse the repository at this point in the history
…d builds on Mac OS X (issue #733)
  • Loading branch information
saudet committed Jun 4, 2019
1 parent ef9a591 commit c738e37
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@

* Set correct default path to `javacpp.platform.compiler` for Android builds on Mac OS X ([issue #733](https://github.com/bytedeco/javacpp-presets/issues/733))
* Call `Loader.checkVersion()` in all presets to log warnings with potentially incompatible versions of JavaCPP
* Add missing `mkl_gnu_thread` preload in presets for OpenBLAS, MKL-DNN, and TensorFlow ([pull #729](https://github.com/bytedeco/javacpp-presets/pull/729))
* Overload `Tensor.create()` factory methods for TensorFlow with handy `long... shape` ([issue bytedeco/javacpp#301](https://github.com/bytedeco/javacpp/issues/301))
Expand Down
11 changes: 7 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -728,7 +728,7 @@
<javacpp.platform.nativeOutputPath>${javacpp.platform.library.path}</javacpp.platform.nativeOutputPath>
<javacpp.platform>android-arm</javacpp.platform>
<javacpp.platform.root>${user.home}/Android/android-ndk/</javacpp.platform.root>
<javacpp.platform.compiler>toolchains/llvm/prebuilt/${os.name}-${os.arch}/bin/clang++</javacpp.platform.compiler>
<javacpp.platform.compiler>toolchains/llvm/prebuilt/${os.kernel}-${os.arch}/bin/clang++</javacpp.platform.compiler>
<javacpp.platform.properties>${javacpp.platform}-clang</javacpp.platform.properties>
<javacpp.platform.android-arm>${javacpp.platform}</javacpp.platform.android-arm>
<javacpp.platform.android-arm64></javacpp.platform.android-arm64>
Expand Down Expand Up @@ -775,7 +775,7 @@
<javacpp.platform.nativeOutputPath>${javacpp.platform.library.path}</javacpp.platform.nativeOutputPath>
<javacpp.platform>android-arm64</javacpp.platform>
<javacpp.platform.root>${user.home}/Android/android-ndk/</javacpp.platform.root>
<javacpp.platform.compiler>toolchains/llvm/prebuilt/${os.name}-${os.arch}/bin/clang++</javacpp.platform.compiler>
<javacpp.platform.compiler>toolchains/llvm/prebuilt/${os.kernel}-${os.arch}/bin/clang++</javacpp.platform.compiler>
<javacpp.platform.properties>${javacpp.platform}-clang</javacpp.platform.properties>
<javacpp.platform.android-arm></javacpp.platform.android-arm>
<javacpp.platform.android-arm64>${javacpp.platform}</javacpp.platform.android-arm64>
Expand Down Expand Up @@ -822,7 +822,7 @@
<javacpp.platform.nativeOutputPath>${javacpp.platform.library.path}</javacpp.platform.nativeOutputPath>
<javacpp.platform>android-x86</javacpp.platform>
<javacpp.platform.root>${user.home}/Android/android-ndk/</javacpp.platform.root>
<javacpp.platform.compiler>toolchains/llvm/prebuilt/${os.name}-${os.arch}/bin/clang++</javacpp.platform.compiler>
<javacpp.platform.compiler>toolchains/llvm/prebuilt/${os.kernel}-${os.arch}/bin/clang++</javacpp.platform.compiler>
<javacpp.platform.properties>${javacpp.platform}-clang</javacpp.platform.properties>
<javacpp.platform.android-arm></javacpp.platform.android-arm>
<javacpp.platform.android-arm64></javacpp.platform.android-arm64>
Expand Down Expand Up @@ -869,7 +869,7 @@
<javacpp.platform.nativeOutputPath>${javacpp.platform.library.path}</javacpp.platform.nativeOutputPath>
<javacpp.platform>android-x86_64</javacpp.platform>
<javacpp.platform.root>${user.home}/Android/android-ndk/</javacpp.platform.root>
<javacpp.platform.compiler>toolchains/llvm/prebuilt/${os.name}-${os.arch}/bin/clang++</javacpp.platform.compiler>
<javacpp.platform.compiler>toolchains/llvm/prebuilt/${os.kernel}-${os.arch}/bin/clang++</javacpp.platform.compiler>
<javacpp.platform.properties>${javacpp.platform}-clang</javacpp.platform.properties>
<javacpp.platform.android-arm></javacpp.platform.android-arm>
<javacpp.platform.android-arm64></javacpp.platform.android-arm64>
Expand Down Expand Up @@ -1673,6 +1673,7 @@
<os><name>linux</name></os>
</activation>
<properties>
<os.kernel>linux</os.kernel>
<os.name>linux</os.name>
</properties>
</profile>
Expand All @@ -1682,6 +1683,7 @@
<os><name>mac os x</name></os>
</activation>
<properties>
<os.kernel>darwin</os.kernel>
<os.name>macosx</os.name>
</properties>
</profile>
Expand All @@ -1691,6 +1693,7 @@
<os><family>windows</family></os>
</activation>
<properties>
<os.kernel>windows</os.kernel>
<os.name>windows</os.name>
</properties>
</profile>
Expand Down

0 comments on commit c738e37

Please sign in to comment.