updates build system
This commit is contained in:
		| @@ -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
									
									
									
									
									
								
							 Submodule scc updated: bee44d83d0...e0c3b9ab6a
									
								
							| @@ -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); | ||||
|   | ||||
 Submodule tgc-iss/dbt-rise-core updated: d40069a261...8a2fe18cba
									
								
							 Submodule tgc-iss/dbt-rise-tgc updated: 1ad66a71d8...ec55efd322
									
								
							
							
								
								
									
										2
									
								
								vpvper
									
									
									
									
									
								
							
							
								
								
								
								
								
							
						
						
									
										2
									
								
								vpvper
									
									
									
									
									
								
							 Submodule vpvper updated: 9982e812f3...55f81f2149
									
								
							
		Reference in New Issue
	
	Block a user