upgrades cxx version for std::variant in vmbase, updates asmjit and reorder for proper build
This commit is contained in:
parent
e8037b9c27
commit
b118b43988
|
@ -16,7 +16,7 @@ if(CMAKE_PROJECT_NAME STREQUAL "TGC-ISS")
|
||||||
option(WITH_LLVM "Build LLVM backend" OFF)
|
option(WITH_LLVM "Build LLVM backend" OFF)
|
||||||
option(WITH_ASMJIT "Build ASMJIT 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_STANDARD_REQUIRED ON)
|
||||||
set(CMAKE_CXX_EXTENSIONS OFF)
|
set(CMAKE_CXX_EXTENSIONS OFF)
|
||||||
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
|
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)
|
list(APPEND CONAN_PACKAGE_OPTIONS libiconv:shared=True)
|
||||||
endif()
|
endif()
|
||||||
if(WITH_ASMJIT)
|
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)
|
list(APPEND CONAN_PACKAGE_OPTIONS asmjit:shared=False)
|
||||||
endif()
|
endif()
|
||||||
if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dbt-rise-plugins)
|
if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dbt-rise-plugins)
|
||||||
|
|
Loading…
Reference in New Issue