From 7bb6b06e2d17c3130d85b4eac0d5bc53680ff733 Mon Sep 17 00:00:00 2001 From: Luke Street Date: Fri, 11 Jun 2021 22:57:38 -0400 Subject: [PATCH] Small fixes to workflows, bintoc/shaderc, CMakePresets --- .github/workflows/build.yml | 4 ++-- .github/workflows/release.yml | 4 ++-- CMakePresets.json | 3 ++- hecl/bintoc/CMakeLists.txt | 2 +- hecl/shaderc/CMakeLists.txt | 6 +++--- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e310c5057..75c045b06 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -42,9 +42,9 @@ jobs: sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB rm GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB sudo add-apt-repository "deb https://apt.repos.intel.com/oneapi all main" - sudo apt-get -y install curl git cmake ninja-build clang lld libcurl4-openssl-dev intel-oneapi-ipp-devel \ + sudo apt-get -y install ninja-build clang lld libcurl4-openssl-dev intel-oneapi-ipp-devel \ zlib1g-dev libglu1-mesa-dev libdbus-1-dev libvulkan-dev libxi-dev libxrandr-dev libasound2-dev \ - libpulse-dev libudev-dev libpng-dev libncurses5-dev libx11-xcb-dev python3 python-is-python3 qt5-default + libpulse-dev libudev-dev libpng-dev libncurses5-dev libx11-xcb-dev qt5-default yarn global add @sentry/cli echo "$(yarn global bin)" >> $GITHUB_PATH diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2d7487cf7..4fcf70f87 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -44,9 +44,9 @@ jobs: sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB rm GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB sudo add-apt-repository "deb https://apt.repos.intel.com/oneapi all main" - sudo apt-get -y install curl git cmake ninja-build clang lld libcurl4-openssl-dev intel-oneapi-ipp-devel \ + sudo apt-get -y install ninja-build clang lld libcurl4-openssl-dev intel-oneapi-ipp-devel \ zlib1g-dev libglu1-mesa-dev libdbus-1-dev libvulkan-dev libxi-dev libxrandr-dev libasound2-dev \ - libpulse-dev libudev-dev libpng-dev libncurses5-dev libx11-xcb-dev python3 python-is-python3 qt5-default + libpulse-dev libudev-dev libpng-dev libncurses5-dev libx11-xcb-dev qt5-default yarn global add @sentry/cli echo "$(yarn global bin)" >> $GITHUB_PATH diff --git a/CMakePresets.json b/CMakePresets.json index ef0857c60..d2d5bee2a 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -19,7 +19,8 @@ "hidden": true, "cacheVariables": { "CMAKE_BUILD_TYPE": "RelWithDebInfo", - "CMAKE_MSVC_RUNTIME_LIBRARY": "MultiThreaded" + "CMAKE_MSVC_RUNTIME_LIBRARY": "MultiThreaded", + "SENTRY_DSN": "$env{SENTRY_DSN}" } }, { diff --git a/hecl/bintoc/CMakeLists.txt b/hecl/bintoc/CMakeLists.txt index f7bdc4bd1..c2d5d3f3d 100644 --- a/hecl/bintoc/CMakeLists.txt +++ b/hecl/bintoc/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_policy(VERSION 3.15...3.20) project(bintoc LANGUAGES C) add_executable(bintoc bintoc.c) -add_subdirectory(../../extern/athena/extern/zlib zlib) +add_subdirectory(../../extern/athena/extern/zlib zlib EXCLUDE_FROM_ALL) target_link_libraries(bintoc PRIVATE ${ZLIB_LIBRARIES}) target_include_directories(bintoc PRIVATE ${ZLIB_INCLUDE_DIR}) diff --git a/hecl/shaderc/CMakeLists.txt b/hecl/shaderc/CMakeLists.txt index fb69140c4..feefc2dde 100644 --- a/hecl/shaderc/CMakeLists.txt +++ b/hecl/shaderc/CMakeLists.txt @@ -73,8 +73,8 @@ endif () set(CMAKE_SKIP_INSTALL_ALL_DEPENDENCY true) add_custom_target(atdna) # avoid building -add_subdirectory(../../extern/athena athena) -add_subdirectory(../../extern/boo boo) +add_subdirectory(../../extern/athena athena EXCLUDE_FROM_ALL) +add_subdirectory(../../extern/boo boo EXCLUDE_FROM_ALL) add_library(hecl-compilers ../lib/Compilers.cpp ../lib/WideStringConvert.cpp) get_target_property(BOO_INCLUDES boo INTERFACE_INCLUDE_DIRECTORIES) @@ -96,4 +96,4 @@ if (NOT WIN32) endif() endif() -install(TARGETS shaderc DESTINATION bin) \ No newline at end of file +install(TARGETS shaderc DESTINATION bin)