From 924c21a88df37ffa4681a7f0234c6d015d7cf1a8 Mon Sep 17 00:00:00 2001 From: Asger Gitz-Johansen Date: Sun, 7 Jul 2024 11:58:16 +0200 Subject: [PATCH] fix: update expr and yagraph This new update enables us to not have to install the libz3.so file manually. --- CMakeLists.txt | 15 ++------------- src/cli/lsp/main.cpp | 1 - 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3b61d69..b545fb0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,7 +33,7 @@ find_package(BISON REQUIRED) find_package(FLEX REQUIRED) add_compile_definitions(DEFAULT_EXPRESSION_VALUE="true") -CPMAddPackage(NAME expr VERSION 3.0.4 GITHUB_REPOSITORY sillydan1/expr OPTIONS "ENABLE_Z3 ON") +CPMAddPackage(NAME expr VERSION 3.0.5 GITHUB_REPOSITORY sillydan1/expr OPTIONS "ENABLE_Z3 ON") CPMAddPackage("gh:sillydan1/argvparse@1.2.3") CPMAddPackage("gh:sillydan1/ctl-expr@2.0.3") CPMAddPackage("gh:sillydan1/graphedit-protobuf@1.2.1") @@ -42,8 +42,7 @@ CPMAddPackage("gh:yalibs/yatimer@1.0.0") CPMAddPackage("gh:yalibs/yaoverload@1.0.0") CPMAddPackage("gh:yalibs/yahashcombine@1.0.0") CPMAddPackage("gh:yalibs/yathreadpool@1.0.1") -# CPMAddPackage("gh:yalibs/yagraph@1.0.6") -CPMAddPackage("gh:yalibs/yagraph#feature/validation-things") +CPMAddPackage("gh:yalibs/yagraph@1.1.0") CPMAddPackage("gh:yalibs/yatree@1.2.2") CPMAddPackage("gh:yalibs/yauuid@1.0.1") CPMAddPackage("gh:yalibs/yasetwrappers@1.0.0") @@ -124,16 +123,6 @@ install(FILES src/man/tta.7 DESTINATION man/man7) -if(CMAKE_SYSTEM_NAME STREQUAL "Linux") - install(FILES ${CMAKE_BINARY_DIR}/libz3.so DESTINATION lib) -elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows") - install(FILES ${CMAKE_BINARY_DIR}/libz3.dll DESTINATION lib) -elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin") - install(FILES ${CMAKE_BINARY_DIR}/libz3.dylib DESTINATION lib) -else() - message(WARNING "unknown system ${CMAKE_SYSTEM_NAME}") -endif() - install(DIRECTORY src/ntta src/plugin_system diff --git a/src/cli/lsp/main.cpp b/src/cli/lsp/main.cpp index 7a2e15d..be9c712 100644 --- a/src/cli/lsp/main.cpp +++ b/src/cli/lsp/main.cpp @@ -82,4 +82,3 @@ auto load_plugins(std::map& cli_arguments) -> plugin_ma look_dirs.insert(look_dirs.end(), provided_dirs.begin(), provided_dirs.end()); return aaltitoad::plugins::load(look_dirs); } -