TGFS
/
TGC-ISS
14
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' of https://git.minres.com/TGFS/TGC-ISS into develop

This commit is contained in:
Eyck-Alexander Jentzsch 2024-03-19 11:28:45 +01:00
parent 5c6732f1ae 4c107e03a0
commit 262df83e8e
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cproject
View File

@ -51,7 +51,7 @@
<storageModule buildDir="build/${ConfigName}" dirtyTs="1698593487517" moduleId="de.marw.cmake4eclipse.mbs.settings"> <storageModule buildDir="build/${ConfigName}" dirtyTs="1698593487517" moduleId="de.marw.cmake4eclipse.mbs.settings">
<options/> <options/>
<defs> <defs>
<def name="CMAKE_BUILD_TYPE" type="STRING" val="RelWithDebInfo"/> <def name="CMAKE_BUILD_TYPE" type="STRING" val="Debug"/>
<def name="CMAKE_INSTALL_PREFIX" type="FILEPATH" val="${ProjDirPath}/install"/> <def name="CMAKE_INSTALL_PREFIX" type="FILEPATH" val="${ProjDirPath}/install"/>
<def name="WITH_TCC" type="BOOL" val="ON"/> <def name="WITH_TCC" type="BOOL" val="ON"/>
<def name="FW_BUILD" type="BOOL" val="ON"/> <def name="FW_BUILD" type="BOOL" val="ON"/>

11
CMakeLists.txt
View File

@ -55,7 +55,7 @@ if(CMAKE_PROJECT_NAME STREQUAL "TGC-ISS")
set(CONAN_BOOST_OPTIONS set(CONAN_BOOST_OPTIONS
boost:fPIC=True boost:fPIC=True
boost:shared=${SHARED_FLAG} boost:shared=False
boost:header_only=False boost:header_only=False
boost:without_contract=True boost:without_contract=True
boost:without_graph=True boost:without_graph=True
@ -203,7 +203,7 @@ if(CMAKE_PROJECT_NAME STREQUAL "TGC-ISS")
set(FETCHCONTENT_BASE_DIR ${CMAKE_CURRENT_BINARY_DIR}/..) set(FETCHCONTENT_BASE_DIR ${CMAKE_CURRENT_BINARY_DIR}/..)
FetchContent_Declare( FetchContent_Declare(
riscvfw riscvfw
GIT_REPOSITORY https://git.minres.com/VP/Firmwares.git GIT_REPOSITORY https://git.minres.com/Firmware/Firmwares.git
GIT_TAG main GIT_TAG main
GIT_SHALLOW OFF GIT_SHALLOW OFF
UPDATE_DISCONNECTED ON UPDATE_DISCONNECTED ON
@ -217,7 +217,14 @@ if(CMAKE_PROJECT_NAME STREQUAL "TGC-ISS")
endif() endif()
add_subdirectory(dbt-rise-core) add_subdirectory(dbt-rise-core)
if(CMAKE_PROJECT_NAME STREQUAL "TGC-ISS" AND NOT USE_CWR_SYSTEMC)
set(SCC_CMAKE_CONFIG_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/scc)
add_subdirectory(scc/src/common)
message("blah")
else()
message("blub")
add_subdirectory(scc) add_subdirectory(scc)
endif()
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)