From b118b43988943c6309fffaceadf6c0d47a99e774 Mon Sep 17 00:00:00 2001 From: Eyck-Alexander Jentzsch Date: Mon, 8 Jul 2024 11:48:11 +0200 Subject: [PATCH] upgrades cxx version for std::variant in vmbase, updates asmjit and reorder for proper build --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4d7626a..2dbb725 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,7 @@ if(CMAKE_PROJECT_NAME STREQUAL "TGC-ISS") option(WITH_LLVM "Build LLVM backend" OFF) option(WITH_ASMJIT "Build ASMJIT backend" OFF) - set(CMAKE_CXX_STANDARD 14) + set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_POSITION_INDEPENDENT_CODE ON) @@ -98,7 +98,7 @@ if(CMAKE_PROJECT_NAME STREQUAL "TGC-ISS") list(APPEND CONAN_PACKAGE_OPTIONS libiconv:shared=True) endif() if(WITH_ASMJIT) - list(APPEND CONAN_PACKAGE_LIST asmjit/cci.20230325) + list(APPEND CONAN_PACKAGE_LIST asmjit/cci.20240531) list(APPEND CONAN_PACKAGE_OPTIONS asmjit:shared=False) endif() if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dbt-rise-plugins)