kscience/kmath
9
0
Fork 1
Code Issues Pull Requests 6 Packages Projects Releases 16 Wiki Activity

Changes for upcoming GSL extension project #148

Merged
CommanderTvis merged 98 commits from gsl-experiment into dev 2021-02-19 13:34:27 +03:00
Conversation 3 Commits 98 Files Changed 7 +8 -11
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit eedfcf3932 - Show all commits

5
.github/workflows/gradle.yml vendored
View File

@ -73,10 +73,7 @@ jobs:
uses: actions/setup-java@v1 uses: actions/setup-java@v1
with: with:
java-version: 11 java-version: 11
- name: Install mingw-w64-x86_64-gsl
run: c:\msys64\usr\bin\pacman --noconfirm -S mingw-w64-x86_64-gsl
- name: Add msys to path - name: Add msys to path
# msys installed on default image but not in path
run: SETX PATH "%PATH%;C:\msys64\mingw64\bin" run: SETX PATH "%PATH%;C:\msys64\mingw64\bin"
- name: Cache gradle - name: Cache gradle
uses: actions/cache@v2 uses: actions/cache@v2
@ -96,4 +93,4 @@ jobs:
key: ${{ runner.os }}-konan-1.4.20-eap-37 key: ${{ runner.os }}-konan-1.4.20-eap-37
restore-keys: ${{ runner.os }}-konan-1.4.20-eap-37 restore-keys: ${{ runner.os }}-konan-1.4.20-eap-37
- name: Build with Gradle - name: Build with Gradle
run: ./gradlew --build-cache :kmath-gsl:cinteropLibgslNative build run: ./gradlew --build-cache build

14
kmath-gsl/build.gradle.kts
View File

@ -5,13 +5,13 @@ plugins {
} }
kotlin { kotlin {
val hostOs = System.getProperty("os.name") val nativeTarget = when (System.getProperty("os.name")) {
"Mac OS X" -> macosX64("native")
val nativeTarget = when { "Linux" -> linuxX64("native")
hostOs == "Mac OS X" -> macosX64("native") else -> {
hostOs == "Linux" -> linuxX64("native") logger.warn("Current OS cannot build any of kmath-gsl targets.")
hostOs.startsWith("Windows") -> mingwX64("native") return@kotlin
else -> throw GradleException("Host OS is not supported in Kotlin/Native.") }
} }
val main by nativeTarget.compilations.getting { val main by nativeTarget.compilations.getting {