forked from kscience/kmath
Fix build
This commit is contained in:
parent
e5d5ac17da
commit
4fc8d7b57c
18
.github/workflows/gradle.yml
vendored
18
.github/workflows/gradle.yml
vendored
@ -33,9 +33,9 @@ jobs:
|
||||
with:
|
||||
path: |
|
||||
~/.konan/dependencies
|
||||
~/.konan/kotlin-native-prebuilt-linux-1.4.20-eap-37
|
||||
key: ${{ runner.os }}-konan-1.4.20-eap-37
|
||||
restore-keys: ${{ runner.os }}-konan-1.4.20-eap-37
|
||||
~/.konan/kotlin-native-prebuilt-linux-1.4.20
|
||||
key: ${{ runner.os }}-konan-1.4.20
|
||||
restore-keys: ${{ runner.os }}-konan-1.4.20
|
||||
- name: Build with Gradle
|
||||
run: ./gradlew -Dorg.gradle.daemon=false --build-cache build
|
||||
build-osx:
|
||||
@ -63,9 +63,9 @@ jobs:
|
||||
with:
|
||||
path: |
|
||||
~/.konan/dependencies
|
||||
~/.konan/kotlin-native-prebuilt-macos-1.4.20-eap-37
|
||||
key: ${{ runner.os }}-konan-1.4.20-eap-37
|
||||
restore-keys: ${{ runner.os }}-konan-1.4.20-eap-37
|
||||
~/.konan/kotlin-native-prebuilt-macos-1.4.20
|
||||
key: ${{ runner.os }}-konan-1.4.20
|
||||
restore-keys: ${{ runner.os }}-konan-1.4.20
|
||||
- name: Build with Gradle
|
||||
run: sudo ./gradlew -Dorg.gradle.daemon=false --build-cache build
|
||||
|
||||
@ -94,8 +94,8 @@ jobs:
|
||||
with:
|
||||
path: |
|
||||
~/.konan/dependencies
|
||||
~/.konan/kotlin-native-prebuilt-mingw-1.4.20-eap-37
|
||||
key: ${{ runner.os }}-konan-1.4.20-eap-37
|
||||
restore-keys: ${{ runner.os }}-konan-1.4.20-eap-37
|
||||
~/.konan/kotlin-native-prebuilt-mingw-1.4.20
|
||||
key: ${{ runner.os }}-konan-1.4.20
|
||||
restore-keys: ${{ runner.os }}-konan-1.4.20
|
||||
- name: Build with Gradle
|
||||
run: ./gradlew --build-cache build
|
||||
|
@ -1,6 +1,7 @@
|
||||
kotlin.code.style=official
|
||||
kotlin.mpp.enableGranularSourceSetsMetadata=true
|
||||
kotlin.mpp.stability.nowarn=true
|
||||
kotlin.native.enableDependencyPropagation=false
|
||||
kotlin.native.ignoreDisabledTargets=true
|
||||
kotlin.parallel.tasks.in.project=true
|
||||
org.gradle.jvmargs=-XX:MaxMetaspaceSize=512m
|
||||
|
@ -12,7 +12,7 @@ kotlin {
|
||||
|
||||
val nativeTarget = when (System.getProperty("os.name")) {
|
||||
"Mac OS X" -> macosX64()
|
||||
"Linux" -> linuxX64("native")
|
||||
"Linux" -> linuxX64()
|
||||
|
||||
else -> {
|
||||
logger.warn("Current OS cannot build any of kmath-gsl targets.")
|
||||
@ -29,7 +29,7 @@ kotlin {
|
||||
val test by nativeTarget.compilations.getting
|
||||
|
||||
sourceSets {
|
||||
val nativeMain by getting {
|
||||
val nativeMain by creating {
|
||||
val codegen by tasks.creating {
|
||||
matricesCodegen(kotlin.srcDirs.first().absolutePath + "/kscience/kmath/gsl/_Matrices.kt")
|
||||
vectorsCodegen(kotlin.srcDirs.first().absolutePath + "/kscience/kmath/gsl/_Vectors.kt")
|
||||
@ -42,11 +42,11 @@ kotlin {
|
||||
}
|
||||
}
|
||||
|
||||
val nativeTest by getting {
|
||||
val nativeTest by creating {
|
||||
dependsOn(nativeMain)
|
||||
}
|
||||
|
||||
// main.defaultSourceSet.dependsOn(nativeMain)
|
||||
// test.defaultSourceSet.dependsOn(nativeTest)
|
||||
main.defaultSourceSet.dependsOn(nativeMain)
|
||||
test.defaultSourceSet.dependsOn(nativeTest)
|
||||
}
|
||||
}
|
||||
|
@ -1,8 +1,6 @@
|
||||
package kscience.kmath.gsl
|
||||
|
||||
import kotlinx.cinterop.CPointer
|
||||
import kotlinx.cinterop.DeferScope
|
||||
import kotlinx.cinterop.pointed
|
||||
import kotlinx.cinterop.*
|
||||
import org.gnu.gsl.*
|
||||
|
||||
internal class GslRealVector(override val nativeHandle: CPointer<gsl_vector>, scope: DeferScope) :
|
||||
|
Loading…
Reference in New Issue
Block a user