Skip to content

Commit

Permalink
fix permisssion in cmake and gradle
Browse files Browse the repository at this point in the history
  • Loading branch information
canxin121 committed Mar 29, 2024
1 parent b53bb35 commit 302ebce
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
4 changes: 3 additions & 1 deletion cmake/cargokit.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ function(apply_cargokit target manifest_dir lib_name any_symbol_name)
else()
set(SCRIPT_EXTENSION ".sh")
set(IMPORT_LIB_EXTENSION "")
execute_process(COMMAND chmod +x "${cargokit_cmake_root}/run_build_tool${SCRIPT_EXTENSION}")
endif()

# Using generators in custom command is only supported in CMake 3.20+
Expand All @@ -75,6 +76,7 @@ function(apply_cargokit target manifest_dir lib_name any_symbol_name)
)
endif()


set_source_files_properties("${CMAKE_CURRENT_BINARY_DIR}/_phony_" PROPERTIES SYMBOLIC TRUE)

if (TARGET ${target})
Expand All @@ -94,4 +96,4 @@ function(apply_cargokit target manifest_dir lib_name any_symbol_name)
# Allow adding the output library to plugin bundled libraries
set("${target}_cargokit_lib" ${OUTPUT_LIB} PARENT_SCOPE)

endfunction()
endfunction()
8 changes: 7 additions & 1 deletion gradle/plugin.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,13 @@ abstract class CargoKitBuildTask extends DefaultTask {
def manifestDir = Paths.get(project.buildscript.sourceFile.parent, project.cargokit.manifestDir)

def rootProjectDir = project.rootProject.projectDir


if (!Os.isFamily(Os.FAMILY_WINDOWS)) {
project.exec {
commandLine 'chmod', '+x', path
}
}

project.exec {
executable path
args "build-gradle"
Expand Down

0 comments on commit 302ebce

Please sign in to comment.