updates build system to cope better with CentOS
Interp architectural test suite / Setup and build ISS (push) Failing after 2m23s
Details
Interp architectural test suite / Test interp backend (push) Failing after 1m6s
Details
Interp architectural test suite / Test llvm backend (push) Failing after 1m14s
Details
Interp architectural test suite / Test asmjit backend (push) Has been cancelled
Details
Interp architectural test suite / Test tcc backend (push) Has been cancelled
Details
Interp architectural test suite / Setup and build ISS (push) Failing after 2m23s
Details
Interp architectural test suite / Test interp backend (push) Failing after 1m6s
Details
Interp architectural test suite / Test llvm backend (push) Failing after 1m14s
Details
Interp architectural test suite / Test asmjit backend (push) Has been cancelled
Details
Interp architectural test suite / Test tcc backend (push) Has been cancelled
Details
This commit is contained in:
parent
6ef27d8c58
commit
6c304055bf
|
@ -79,6 +79,7 @@ if(CMAKE_PROJECT_NAME STREQUAL "TGC-ISS")
|
||||||
|
|
||||||
set(B2_VERSION 4.9.6)
|
set(B2_VERSION 4.9.6)
|
||||||
set(CM_VERSION 3.20.5)
|
set(CM_VERSION 3.20.5)
|
||||||
|
set(LLVM_VERSION 13.0.0)
|
||||||
set(CONAN_PACKAGE_LIST
|
set(CONAN_PACKAGE_LIST
|
||||||
fmt/8.0.1
|
fmt/8.0.1
|
||||||
spdlog/1.9.2
|
spdlog/1.9.2
|
||||||
|
@ -98,7 +99,7 @@ if(CMAKE_PROJECT_NAME STREQUAL "TGC-ISS")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(WITH_LLVM)
|
if(WITH_LLVM)
|
||||||
list(APPEND CONAN_PACKAGE_LIST llvm-core/13.0.0)
|
list(APPEND CONAN_PACKAGE_LIST llvm-core/${LLVM_VERSION})
|
||||||
list(APPEND CONAN_PACKAGE_OPTIONS libiconv:shared=True)
|
list(APPEND CONAN_PACKAGE_OPTIONS libiconv:shared=True)
|
||||||
endif()
|
endif()
|
||||||
if(WITH_ASMJIT)
|
if(WITH_ASMJIT)
|
||||||
|
@ -116,8 +117,13 @@ if(CMAKE_PROJECT_NAME STREQUAL "TGC-ISS")
|
||||||
# Boost on CentOS 7 quirks: the b2 of conan-center is build against a newer libstdc++ and therefore does not run
|
# Boost on CentOS 7 quirks: the b2 of conan-center is build against a newer libstdc++ and therefore does not run
|
||||||
# with the oooooold libs on CentOS 7. Therefore we build our own version of b2 if it is not there
|
# with the oooooold libs on CentOS 7. Therefore we build our own version of b2 if it is not there
|
||||||
###########################################################################
|
###########################################################################
|
||||||
|
find_program(LSB_RELEASE_EXEC lsb_release)
|
||||||
|
if(NOT LSB_RELEASE_EXEC-NOTFOUND)
|
||||||
|
execute_process(COMMAND "${LSB_RELEASE_EXEC}" --short --id OUTPUT_VARIABLE LSB_RELEASE_ID_SHORT OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||||
|
if(LSB_RELEASE_ID_SHORT MATCHES "CentOS")
|
||||||
set(B2_META $ENV{HOME}/.conan/data/b2/${B2_VERSION}/_/_/metadata.json)
|
set(B2_META $ENV{HOME}/.conan/data/b2/${B2_VERSION}/_/_/metadata.json)
|
||||||
set(CM_META $ENV{HOME}/.conan/data/cmake/${CM_VERSION}/_/_/metadata.json)
|
set(CM_META $ENV{HOME}/.conan/data/cmake/${CM_VERSION}/_/_/metadata.json)
|
||||||
|
set(LLVM_META $ENV{HOME}/.conan/data/llvm-core/${LLVM_VERSION}/_/_/metadata.json)
|
||||||
if(DEFINED ENV{CONAN_USER_HOME})
|
if(DEFINED ENV{CONAN_USER_HOME})
|
||||||
set(B2_META $ENV{CONAN_USER_HOME}/.conan/data/b2/${B2_VERSION}/_/_/metadata.json)
|
set(B2_META $ENV{CONAN_USER_HOME}/.conan/data/b2/${B2_VERSION}/_/_/metadata.json)
|
||||||
set(CMAKE_META $ENV{CONAN_USER_HOME}/.conan/data/cmake/${CM_VERSION}/_/_/metadata.json)
|
set(CMAKE_META $ENV{CONAN_USER_HOME}/.conan/data/cmake/${CM_VERSION}/_/_/metadata.json)
|
||||||
|
@ -132,6 +138,13 @@ if(CMAKE_PROJECT_NAME STREQUAL "TGC-ISS")
|
||||||
conan_cmake_autodetect(settings BUILD_TYPE Release)
|
conan_cmake_autodetect(settings BUILD_TYPE Release)
|
||||||
conan_cmake_install(PATH_OR_REFERENCE . BUILD cmake SETTINGS ${settings})
|
conan_cmake_install(PATH_OR_REFERENCE . BUILD cmake SETTINGS ${settings})
|
||||||
endif()
|
endif()
|
||||||
|
if(NOT EXISTS ${LLVM_META})
|
||||||
|
conan_configure(REQUIRES llvm-core/13.0.0)
|
||||||
|
conan_cmake_autodetect(settings BUILD_TYPE Release)
|
||||||
|
conan_cmake_install(PATH_OR_REFERENCE . BUILD llvm-core SETTINGS ${settings})
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
###########################################################################
|
###########################################################################
|
||||||
# Boost on CentOS 7 quirks end
|
# Boost on CentOS 7 quirks end
|
||||||
###########################################################################
|
###########################################################################
|
||||||
|
@ -228,5 +241,4 @@ if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dbt-rise-plugins)
|
||||||
add_subdirectory(dbt-rise-plugins)
|
add_subdirectory(dbt-rise-plugins)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
||||||
include(CTest)
|
include(CTest)
|
||||||
|
|
Loading…
Reference in New Issue