Merge branch 'develop' into main
This commit is contained in:
2
.envrc
2
.envrc
@@ -3,6 +3,8 @@ distro=`/bin/lsb_release -i -s`
|
|||||||
if [ $distro == "CentOS" ]; then
|
if [ $distro == "CentOS" ]; then
|
||||||
. /opt/rh/devtoolset-8/enable
|
. /opt/rh/devtoolset-8/enable
|
||||||
. /opt/rh/rh-python38/enable
|
. /opt/rh/rh-python38/enable
|
||||||
|
elif [ $distro == "Rocky" ]; then
|
||||||
|
. /opt/rh/gcc-toolset-11/enable
|
||||||
fi
|
fi
|
||||||
layout python3
|
layout python3
|
||||||
[ -f .envrc.$USER ] && . .envrc.$USER
|
[ -f .envrc.$USER ] && . .envrc.$USER
|
||||||
|
1
.gitignore
vendored
1
.gitignore
vendored
@@ -22,3 +22,4 @@
|
|||||||
/dbt-rise-plugins
|
/dbt-rise-plugins
|
||||||
/.direnv
|
/.direnv
|
||||||
/TGC_C_XRB/
|
/TGC_C_XRB/
|
||||||
|
/.envrc.eyck
|
||||||
|
@@ -225,13 +225,13 @@ if(CMAKE_PROJECT_NAME STREQUAL "TGC-ISS")
|
|||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
add_subdirectory(dbt-rise-core)
|
|
||||||
if(CMAKE_PROJECT_NAME STREQUAL "TGC-ISS" AND NOT USE_CWR_SYSTEMC)
|
if(CMAKE_PROJECT_NAME STREQUAL "TGC-ISS" AND NOT USE_CWR_SYSTEMC)
|
||||||
set(SCC_CMAKE_CONFIG_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/scc)
|
set(SCC_CMAKE_CONFIG_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/scc)
|
||||||
add_subdirectory(scc/src/common)
|
add_subdirectory(scc/src/common)
|
||||||
else()
|
else()
|
||||||
add_subdirectory(scc)
|
add_subdirectory(scc)
|
||||||
endif()
|
endif()
|
||||||
|
add_subdirectory(dbt-rise-core)
|
||||||
add_subdirectory(dbt-rise-tgc)
|
add_subdirectory(dbt-rise-tgc)
|
||||||
if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dbt-rise-plugins)
|
if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dbt-rise-plugins)
|
||||||
add_subdirectory(dbt-rise-plugins)
|
add_subdirectory(dbt-rise-plugins)
|
||||||
|
Submodule dbt-rise-core updated: 6a5bb0fe5e...b725ff307b
Submodule dbt-rise-tgc updated: 3fd51cc68c...346b177a87
2
scc
2
scc
Submodule scc updated: 4dcc5497c5...59d07fbc66
Reference in New Issue
Block a user