Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
cmake_minimum_required(VERSION 3.0)
cmake_policy(SET CMP0048 OLD)
cmake_policy(SET CMP0042 NEW)
# Determine if compiling on Apple and host arch before starting project
if(APPLE AND NOT CMAKE_OSX_ARCHITECTURES)
execute_process(COMMAND uname -m OUTPUT_VARIABLE ARCH_TYPE OUTPUT_STRIP_TRAILING_WHITESPACE)
SET(CMAKE_OSX_ARCHITECTURES "${ARCH_TYPE}" CACHE STRING "Build architectures for Mac OS X" FORCE)
endif()





project(jssc CXX)

Expand Down
78 changes: 73 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<!-- dependency versions a-z -->
<dependency.junit.version>4.12</dependency.junit.version>
<dependency.logback.version>1.2.3</dependency.logback.version>
<dependency.nativelibloader.version>2.3.3</dependency.nativelibloader.version>
<dependency.nativelibloader.version>2.3.5</dependency.nativelibloader.version>

<!-- plugin versions a-z -->
<plugin.animalsniffer.version>1.17</plugin.animalsniffer.version>
Expand Down Expand Up @@ -478,6 +478,21 @@
</properties>
</profile>

<!-- cmake windows-aarch64 profile -->
<profile>
<id>winarm64</id>
<properties>
<os.detected.name>windows</os.detected.name>
<os.detected.arch>aarch64</os.detected.arch>
<os.detected.bitness>64</os.detected.bitness>
<!-- skip test on cross-compile -->
<maven.test.skip>true</maven.test.skip>
<cmake.generate.args>-DCMAKE_GENERATOR_PLATFORM=arm64 -DNATIVE_LIB_DIR=${os.detected.name}_arm64</cmake.generate.args>
<cmake.build.args>--config Release</cmake.build.args>

</properties>
</profile>

<!-- cmake windows-x86 profile -->
<profile>
<id>win32</id>
Expand Down Expand Up @@ -506,7 +521,7 @@
</properties>
</profile>

<!-- cmake mingw64 profile -->
<!-- cmake mingw64 profile -->
<profile>
<id>mingw64</id>
<properties>
Expand All @@ -519,6 +534,19 @@
</properties>
</profile>

<!-- cmake mingw64 profile -->
<profile>
<id>mingwarm64</id>
<properties>
<os.detected.name>windows</os.detected.name>
<os.detected.arch>aarch64</os.detected.arch>
<os.detected.bitness>64</os.detected.bitness>
<!-- skip test on cross-compile -->
<maven.test.skip>true</maven.test.skip>
<cmake.generate.args>-DCMAKE_TOOLCHAIN_FILE=toolchain/Mingw${os.detected.bitness}.cmake -DNATIVE_LIB_DIR=${os.detected.name}_${os.detected.bitness}</cmake.generate.args>
</properties>
</profile>

<!-- cmake arm soft float profile -->
<profile>
<id>armsf</id>
Expand All @@ -545,10 +573,20 @@
<cmake.generate.args>-DCMAKE_TOOLCHAIN_FILE=toolchain/Armhf.cmake -DNATIVE_LIB_DIR=${os.detected.name}_arm</cmake.generate.args>
</properties>
</profile>

<!-- cmake arm 64-bit -->
<!-- cmake arm 64-bit linux -->
<profile>
<id>aarch64</id>
<id>aarch64-linux</id>
<activation>
<os>
<family>Unix</family>
<name>Linux</name>
</os>
<property>
<name>cmake.build.arch</name>
<value>aarch64</value>
</property>
</activation>
<properties>
<os.detected.name>linux</os.detected.name>
<os.detected.arch>aarch_64</os.detected.arch>
Expand Down Expand Up @@ -605,5 +643,35 @@
<cmake.generate.extra>-DNATIVE_LIB_DIR=${os.detected.name}_arm64</cmake.generate.extra>
</properties>
</profile>

<!-- cmake arm 64-bit mac -->
<profile>
<id>armmac</id>
<properties>
<os.detected.name>osx</os.detected.name>
<os.detected.arch>aarch_64</os.detected.arch>
<os.detected.bitness>64</os.detected.bitness>
<!-- skip test on cross-compile -->
<maven.test.skip>true</maven.test.skip>
<cmake.generate.args>-DCMAKE_OSX_ARCHITECTURES=arm64</cmake.generate.args>
<cmake.generate.extra>-DNATIVE_LIB_DIR=${os.detected.name}_arm64</cmake.generate.extra>
</properties>
</profile>

<!-- cmake intel 64-bit mac -->
<profile>
<id>intelmac</id>
<properties>
<os.detected.name>osx</os.detected.name>
<os.detected.arch>x86_64</os.detected.arch>
<os.detected.bitness>64</os.detected.bitness>
<!-- skip test on cross-compile -->
<maven.test.skip>true</maven.test.skip>
<cmake.generate.args>-DCMAKE_OSX_ARCHITECTURES=x86_64</cmake.generate.args>
<cmake.generate.extra>-DNATIVE_LIB_DIR=${os.detected.name}_x64</cmake.generate.extra>
</properties>
</profile>


</profiles>
</project>
Binary file modified src/main/resources-precompiled/natives/osx_64/libjssc.dylib
Binary file not shown.
Binary file not shown.
Binary file modified src/main/resources-precompiled/natives/windows_64/jssc.dll
Binary file not shown.
Binary file not shown.