updates dbt-rise-tgc and updates build system
All checks were successful
Run architectural test suite on backends / Build ISS, Setup TGC-COMPLIANCE, Run tests on backends (push) Successful in 6m28s
All checks were successful
Run architectural test suite on backends / Build ISS, Setup TGC-COMPLIANCE, Run tests on backends (push) Successful in 6m28s
This commit is contained in:
parent
734522f6c3
commit
57ce6aab92
13
.cproject
13
.cproject
@ -192,7 +192,6 @@
|
||||
<resource resourceType="PROJECT" workspacePath="/TGC-ISS"/>
|
||||
</configuration>
|
||||
</storageModule>
|
||||
<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
|
||||
<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
|
||||
<storageModule cmakelistsFolder="" moduleId="de.marw.cmake4eclipse.mbs.settings">
|
||||
<targets>
|
||||
@ -214,4 +213,16 @@
|
||||
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
|
||||
</scannerConfigBuildInfo>
|
||||
</storageModule>
|
||||
<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets">
|
||||
<buildTargets>
|
||||
<target name="format" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
|
||||
<buildCommand>make</buildCommand>
|
||||
<buildArguments>$<cmake4eclipse_dyn></buildArguments>
|
||||
<buildTarget>format</buildTarget>
|
||||
<stopOnError>true</stopOnError>
|
||||
<useDefaultCommand>true</useDefaultCommand>
|
||||
<runAllBuilders>true</runAllBuilders>
|
||||
</target>
|
||||
</buildTargets>
|
||||
</storageModule>
|
||||
</cproject>
|
3
.gitignore
vendored
3
.gitignore
vendored
@ -20,4 +20,5 @@
|
||||
/fasterDecoding/
|
||||
*.ll
|
||||
/dbt-rise-plugins
|
||||
/.direnv
|
||||
/.direnv
|
||||
/TGC_C_XRB/
|
||||
|
@ -117,27 +117,28 @@ 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
|
||||
# with the oooooold libs on CentOS 7. Therefore we build our own version of b2 if it is not there
|
||||
###########################################################################
|
||||
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(LLVM_META $ENV{HOME}/.conan/data/llvm-core/${LLVM_VERSION}/_/_/metadata.json)
|
||||
if(DEFINED ENV{CONAN_USER_HOME})
|
||||
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)
|
||||
endif()
|
||||
if(NOT EXISTS ${CM_META})
|
||||
conan_configure(REQUIRES cmake/${CM_VERSION})
|
||||
conan_cmake_autodetect(settings BUILD_TYPE Release)
|
||||
conan_cmake_install(PATH_OR_REFERENCE . BUILD cmake SETTINGS ${settings})
|
||||
endif()
|
||||
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(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})
|
||||
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(LLVM_META $ENV{CONAN_USER_HOME}/.conan/data/llvm-core/${LLVM_VERSION}/_/_/metadata.json)
|
||||
endif()
|
||||
if(NOT EXISTS ${B2_META})
|
||||
conan_configure(REQUIRES b2/${B2_VERSION})
|
||||
conan_cmake_autodetect(settings BUILD_TYPE Release)
|
||||
conan_cmake_install(PATH_OR_REFERENCE . BUILD b2 SETTINGS ${settings})
|
||||
endif()
|
||||
if(NOT EXISTS ${CM_META})
|
||||
conan_configure(REQUIRES cmake/${CM_VERSION})
|
||||
conan_cmake_autodetect(settings BUILD_TYPE Release)
|
||||
conan_cmake_install(PATH_OR_REFERENCE . BUILD cmake SETTINGS ${settings})
|
||||
endif()
|
||||
if(NOT EXISTS ${LLVM_META})
|
||||
conan_configure(REQUIRES llvm-core/13.0.0)
|
||||
conan_cmake_autodetect(settings BUILD_TYPE Release)
|
||||
|
@ -1 +1 @@
|
||||
Subproject commit fbcd389580cb7257aeebc61e249a830fd0d3920a
|
||||
Subproject commit 6cb76fc256e6e3f54faf36b7f0c66c5259f6bc05
|
Loading…
Reference in New Issue
Block a user