updates build system
This commit is contained in:
parent
10e8cec06f
commit
aed51b65a7
|
@ -12,7 +12,7 @@
|
|||
</extensions>
|
||||
</storageModule>
|
||||
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
|
||||
<configuration artifactName="${ProjName}" buildProperties="" description="" id="cdt.managedbuild.toolchain.gnu.base.1730410661" name="Debug" optionalBuildProperties="org.eclipse.cdt.docker.launcher.containerbuild.property.selectedvolumes=,org.eclipse.cdt.docker.launcher.containerbuild.property.volumes=" parent="org.eclipse.cdt.build.core.emptycfg">
|
||||
<configuration artifactName="${ProjName}" buildProperties="" description="" id="cdt.managedbuild.toolchain.gnu.base.1730410661" name="Debug" optionalBuildProperties="org.eclipse.cdt.docker.launcher.containerbuild.property.volumes=,org.eclipse.cdt.docker.launcher.containerbuild.property.selectedvolumes=" parent="org.eclipse.cdt.build.core.emptycfg">
|
||||
<folderInfo id="cdt.managedbuild.toolchain.gnu.base.1730410661.218663890" name="/" resourcePath="">
|
||||
<toolChain id="cdt.managedbuild.toolchain.gnu.base.953157788" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.base">
|
||||
<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.GNU_ELF" id="cdt.managedbuild.target.gnu.platform.base.1034252621" name="Debug Platform" osList="linux,hpux,aix,qnx" superClass="cdt.managedbuild.target.gnu.platform.base"/>
|
||||
|
|
|
@ -57,7 +57,15 @@ if (UNIX)
|
|||
list(APPEND CONAN_BOOST_OPTIONS boost:fPIC=True boost:shared=True)
|
||||
endif (UNIX)
|
||||
|
||||
set(CONAN_PACKAGE_LIST fmt/8.0.1 zlib/1.2.11 boost/1.75.0 gsl-lite/0.37.0 elfio/3.8)
|
||||
set(CONAN_PACKAGE_LIST
|
||||
fmt/8.0.1
|
||||
spdlog/1.9.2
|
||||
boost/1.75.0
|
||||
gsl-lite/0.37.0
|
||||
elfio/3.8
|
||||
yaml-cpp/0.7.0
|
||||
jsoncpp/1.9.5
|
||||
)
|
||||
|
||||
if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
|
||||
list(APPEND CONAN_BOOST_OPTIONS boost:fPIC=True lua:compile_as_cpp=False)
|
||||
|
@ -82,6 +90,7 @@ conan_install()
|
|||
find_package(tcc QUIET)
|
||||
find_package(elfio)
|
||||
find_package(fmt)
|
||||
find_package(spdlog)
|
||||
find_package(gsl-lite)
|
||||
set(Boost_NO_BOOST_CMAKE ON) # Don't do a find_package in config mode before searching for a regular boost install.
|
||||
|
||||
|
|
2
scc
2
scc
|
@ -1 +1 @@
|
|||
Subproject commit bee44d83d0b86d71e4e191c7150332e34cc2dd56
|
||||
Subproject commit e0c3b9ab6a4e2fe1a3a3c87d84a617a9d674941d
|
|
@ -77,7 +77,7 @@ system::system(sc_core::sc_module_name nm)
|
|||
|
||||
core_complex.sw_irq_i(msie_int_s);
|
||||
core_complex.timer_irq_i(mtime_int_s);
|
||||
core_complex.global_irq_i(core_int_s);
|
||||
core_complex.ext_irq_i(core_int_s);
|
||||
core_complex.local_irq_i(local_int_s);
|
||||
|
||||
pins_i(gpio0.pins_i);
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit d40069a26170c3026c74f83cdf7ece2177afa914
|
||||
Subproject commit 8a2fe18cba1e799aebd018d0d5434fb00d94b29f
|
|
@ -1 +1 @@
|
|||
Subproject commit 1ad66a71d8e706b37b4d3b2868ac9917c712b00a
|
||||
Subproject commit ec55efd3229b201dde1778d5b7f6e68876d2c99f
|
2
vpvper
2
vpvper
|
@ -1 +1 @@
|
|||
Subproject commit 9982e812f3b590b27baa33c37087fb825055a75a
|
||||
Subproject commit 55f81f21494eba59e30925527d3d2cf4cde7b884
|
Loading…
Reference in New Issue