From 61e6b2467e6fd7e3eea682d6f16031ce75c96ecd Mon Sep 17 00:00:00 2001 From: mthierman Date: Wed, 10 Jul 2024 14:29:16 -0600 Subject: [PATCH] Bump Glow --- CMakeLists.txt | 28 ++++++++++++---------------- libs/Glow | 2 +- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3408110..5bec981 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,24 +1,20 @@ -cmake_minimum_required(VERSION 3.28) +cmake_minimum_required(VERSION 3.29) -project( - Airglow - VERSION 1.7.4 - LANGUAGES C - CXX - ) - -enable_testing() +project(Airglow VERSION 1.7.4) add_subdirectory(libs/Glow) -include(libs/Glow/cmake/ReleaseInfo.cmake) - -file( - DOWNLOAD - "https://aka.ms/vs/17/release/vc_redist.x64.exe" - "${PROJECT_BINARY_DIR}/vc_redist.x64.exe" +list( + APPEND + CMAKE_MODULE_PATH + "${PROJECT_SOURCE_DIR}/libs/Glow/libs/cmake-modules/" ) +include(cmake-modules) + +release_info() +download_vcredist() + file(COPY ${PROJECT_SOURCE_DIR}/data/airglow.rc DESTINATION ${PROJECT_BINARY_DIR}/data) add_custom_command( @@ -81,7 +77,7 @@ target_sources( target_link_libraries( Airglow PRIVATE glow::glow - glow::flags + common::flags ) add_dependencies( diff --git a/libs/Glow b/libs/Glow index 7f10d0e..f33889c 160000 --- a/libs/Glow +++ b/libs/Glow @@ -1 +1 @@ -Subproject commit 7f10d0ed55f12f5537cc482f745ce2a25dbadfd3 +Subproject commit f33889cf1c513a6b94e19f09b1362166f1542d25