Skip to content

Use source extensions instead of source sets #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lacasseio wants to merge 1 commit into
base: nokee_upgrade_2023
Choose a base branch
from
Open

Use source extensions instead of source sets #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 4 additions & 14 deletions static_lib/static_lib.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,16 @@
//import dev.nokee.language.cpp.CppHeaderSet
//import dev.nokee.language.c.CHeaderSet
import dev.nokee.language.nativebase.NativeHeaderSet

plugins {
id 'dev.nokee.native-library'
id 'dev.nokee.cpp-language'
id 'dev.nokee.c-language'
id 'dev.nokee.native-library'
}

library(Configure.withDefaultLibraryConfiguration())
library { lib->
targetLinkages = [linkages.static]

sources {
//cpp { from(fileTree(dir: '.', include: '*.cpp')) }
//c { from(fileTree(dir: '.', include: '*.c')) }
configureEach(CppSourceSet) { from(fileTree(dir: '.', include: '*.cpp')) }
//c { from(fileTree(dir: '.', include: '*.c')) }
//configureEach(CppHeaderSet) { from(isolatedFileTree(dir: projectDir, include: '*.h')) }
//configureEach(CHeaderSet) { from(isolatedFileTree(dir: projectDir, include: '*.h')) }
configureEach(NativeHeaderSet) { from(isolatedFileTree(dir: projectDir, include: '*.h')) }
}
cppSources.from(fileTree(dir: '.', include: '*.cpp'))
cSources.from(fileTree(dir: '.', include: '*.c'))
privateHeaders.from(isolatedFileTree(dir: projectDir, include: '*.h'))

dependencies {
implementation 'system.Crypto:libcrypto:current'
Expand Down
14 changes: 4 additions & 10 deletions subsystem_a/util_1/util_1.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id 'dev.nokee.native-application'
id 'dev.nokee.cpp-language'
id 'dev.nokee.c-language'
id 'dev.nokee.native-application'
id 'glm.windows-subsystem'
id 'glm.installation-manifest-base'
}
Expand All @@ -12,9 +12,6 @@ if(isWindows) {
println "Turning off code signing for ${project.getPath()}, not yet supported on Linux."
}

//import dev.nokee.language.c.CHeaderSet
//import dev.nokee.language.cpp.CppHeaderSet

ext {
windowsSubsystem = 'console'
}
Expand All @@ -27,12 +24,9 @@ application { app->
baseName = 'util_1'

// Add *.cpp/*.c to the project
sources {
//cpp { from(fileTree(dir: '.', include: '*.cpp')) }
//c { from(fileTree(dir: '.', include: '*.c')) }
//configureEach(CppHeaderSet) { from(isolatedFileTree(dir: projectDir, include: '*.h')) }
//configureEach(CHeaderSet) { from(isolatedFileTree(dir: projectDir, include: '*.h')) }
}
cppSources.from(fileTree(dir: '.', include: '*.cpp'))
cSources.from(fileTree(dir: '.', include: '*.c'))
privateHeaders.from(isolatedFileTree(dir: projectDir, include: '*.h'))

// Example of adding a project specific linker command line option.
// This should cause the following output in build\tmp\linkDebug\output.txt:
Expand Down