From 27c6b937047aca1880b7f97ab572ee54b8b5a9dd Mon Sep 17 00:00:00 2001 From: Antony Peacock Date: Tue, 2 Jul 2024 22:01:50 +0100 Subject: [PATCH] Add pre-commit workflow (#318) * Add pre-commit workflow * Fix pre-commit issues --- .conan/profiles/arch/armv8 | 2 +- .github/workflows/pre-commit.yml | 14 ++++++++++++++ cmake/morpheus_add_library.cmake | 2 +- cmake/morpheus_add_target.cmake | 12 ++++++------ conanfile.py | 3 +-- .../nvidia/src/morpheus/gfx/nvidia/CMakeLists.txt | 2 +- 6 files changed, 24 insertions(+), 11 deletions(-) create mode 100644 .github/workflows/pre-commit.yml diff --git a/.conan/profiles/arch/armv8 b/.conan/profiles/arch/armv8 index 50710961..8f0c133c 100644 --- a/.conan/profiles/arch/armv8 +++ b/.conan/profiles/arch/armv8 @@ -1,2 +1,2 @@ [settings] -arch=armv8 \ No newline at end of file +arch=armv8 diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml new file mode 100644 index 00000000..c2f7e71f --- /dev/null +++ b/.github/workflows/pre-commit.yml @@ -0,0 +1,14 @@ +name: pre-commit + +on: + pull_request: + push: + branches: [main] + +jobs: + pre-commit: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-python@v3 + - uses: pre-commit/action@v3.0.0 diff --git a/cmake/morpheus_add_library.cmake b/cmake/morpheus_add_library.cmake index f63863d9..3aff62b8 100644 --- a/cmake/morpheus_add_library.cmake +++ b/cmake/morpheus_add_library.cmake @@ -80,6 +80,6 @@ function(morpheus_add_library) EXPORT morpheus-export-set NAMESPACE morpheus:: DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/morpheus" - ) + ) endfunction() diff --git a/cmake/morpheus_add_target.cmake b/cmake/morpheus_add_target.cmake index 380dcf6c..fe1e4a40 100644 --- a/cmake/morpheus_add_target.cmake +++ b/cmake/morpheus_add_target.cmake @@ -90,7 +90,7 @@ function(morpheus_add_target) add_executable(${MORPHEUS_ALIAS} ALIAS ${MORPHEUS_NAME}) endif() else() - add_library(${MORPHEUS_NAME} ${isInterface}) + add_library(${MORPHEUS_NAME} ${isInterface}) add_library(${MORPHEUS_ALIAS} ALIAS ${MORPHEUS_NAME}) endif() @@ -132,15 +132,15 @@ function(morpheus_add_target_properties) set(oneValueArgs NAME FOLDER) set(multiValueArgs) cmake_parse_arguments(MORPHEUS "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) - + if(${MORPHEUS_INTERFACE}) set(scope "INTERFACE") else() - set(scope "PUBLIC") + set(scope "PUBLIC") endif() - target_compile_features(${MORPHEUS_NAME} ${scope} cxx_std_23) - + target_compile_features(${MORPHEUS_NAME} ${scope} cxx_std_23) + set_target_properties(${MORPHEUS_NAME} PROPERTIES CXX_STANDARD 23 @@ -160,7 +160,7 @@ function(morpheus_add_target_properties) # Create an empty header set here so that the subsequent install step finds it. target_sources(${MORPHEUS_NAME} ${scope} FILE_SET HEADERS FILES) - + install(TARGETS ${MORPHEUS_NAME} EXPORT morpheus-export-set FILE_SET HEADERS diff --git a/conanfile.py b/conanfile.py index 3fafae0e..5d24898f 100644 --- a/conanfile.py +++ b/conanfile.py @@ -284,7 +284,6 @@ def package_info(self): self.cpp_info.components["vulkan"].set_property("cmake_file_name", "MorpheusGfxVulkan") self.cpp_info.components["vulkan"].set_property("cmake_target_name", "morpheus::gfx::vulkan") self.cpp_info.components["vulkan"].requires.append("vulkan-headers::vulkan-headers") - + if (self.settings.os in ["Macos", "iOS", "tvOS"]): self.cpp_info.components["vulkan"].requires.append("moltenvk::moltenvk") - diff --git a/libraries/gfx/nvidia/src/morpheus/gfx/nvidia/CMakeLists.txt b/libraries/gfx/nvidia/src/morpheus/gfx/nvidia/CMakeLists.txt index df4fc9b8..8e3a125d 100644 --- a/libraries/gfx/nvidia/src/morpheus/gfx/nvidia/CMakeLists.txt +++ b/libraries/gfx/nvidia/src/morpheus/gfx/nvidia/CMakeLists.txt @@ -1,7 +1,7 @@ target_sources(MorpheusGfxNVidia PUBLIC FILE_SET HEADERS - FILES + FILES adapter.hpp driver.hpp functions.hpp