updates submodules

This commit is contained in:
Eyck Jentzsch 2023-05-25 20:02:00 +02:00
parent 02abdbfe7f
commit af2473b7a4
4 changed files with 6 additions and 5 deletions

View File

@ -48,12 +48,12 @@
<def name="CMAKE_BUILD_TYPE" type="STRING" val="${ConfigName}"/> <def name="CMAKE_BUILD_TYPE" type="STRING" val="${ConfigName}"/>
</defs> </defs>
</storageModule> </storageModule>
<storageModule buildDir="build/${ConfigName}" dirtyTs="1683822570922" moduleId="de.marw.cmake4eclipse.mbs.settings"> <storageModule buildDir="build/${ConfigName}" dirtyTs="1683822570059" moduleId="de.marw.cmake4eclipse.mbs.settings">
<options/> <options/>
<defs> <defs>
<def name="CMAKE_BUILD_TYPE" type="STRING" val="Debug"/> <def name="CMAKE_BUILD_TYPE" type="STRING" val="Debug"/>
<def name="USE_CWR_SYSTEMC" type="BOOL" val="ON"/> <def name="USE_CWR_SYSTEM" type="BOOL" val="OFF"/>
<def name="BUILD_SHARED_LIBS" type="BOOL" val="ON"/> <def name="BUILD_SHARED_LIBS" type="BOOL" val="OFF"/>
<def name="CODEGEN" type="BOOL" val="OFF"/> <def name="CODEGEN" type="BOOL" val="OFF"/>
<def name="CMAKE_INSTALL_PREFIX" type="FILEPATH" val="${ProjDirPath}/install"/> <def name="CMAKE_INSTALL_PREFIX" type="FILEPATH" val="${ProjDirPath}/install"/>
</defs> </defs>

View File

@ -76,6 +76,7 @@ if(CMAKE_PROJECT_NAME STREQUAL "TGFS-ISS")
lz4/1.9.3 lz4/1.9.3
yaml-cpp/0.7.0 yaml-cpp/0.7.0
jsoncpp/1.9.5 jsoncpp/1.9.5
yaml-cpp/0.7.0
) )
set(CONAN_PACKAGE_OPTIONS fmt:header_only=True ${CONAN_BOOST_OPTIONS}) set(CONAN_PACKAGE_OPTIONS fmt:header_only=True ${CONAN_BOOST_OPTIONS})

@ -1 +1 @@
Subproject commit abc929f17be1adbe6310683fbd060bd10e16321c Subproject commit 61bd4de3932fa749c2012a196c18ac5694058294

2
scc

@ -1 +1 @@
Subproject commit bc2cc3e4775be5c1c0ddcbed0efe7c8b14510e45 Subproject commit 4c02421d3d00347aad37b93923dc82240319c82c