VP
/
HIFIVE1-VP
7
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[WIP] integrate tcc via conan pkg

This commit is contained in:
Eyck Jentzsch 2020-04-10 17:15:35 +02:00
parent 086021da31
commit a66c2c5dca
8 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.3) cmake_minimum_required(VERSION 3.12)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_CURRENT_SOURCE_DIR}/scc/cmake) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_CURRENT_SOURCE_DIR}/scc/cmake)
project(RISCV-VP LANGUAGES CXX) project(RISCV-VP LANGUAGES CXX)
@ -58,7 +58,7 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
set(warnings "/W4 /WX /EHsc") set(warnings "/W4 /WX /EHsc")
endif() endif()
setup_conan(Release) setup_conan(TARGETS)
# This line finds the boost lib and headers. # This line finds the boost lib and headers.
set(Boost_NO_BOOST_CMAKE ON) # Don't do a find_package in config mode before searching for a regular boost install. set(Boost_NO_BOOST_CMAKE ON) # Don't do a find_package in config mode before searching for a regular boost install.

6
conanfile.txt
View File

@ -5,7 +5,9 @@
SystemC/2.3.3@minres/stable SystemC/2.3.3@minres/stable
SystemCVerification/2.0.1@minres/stable SystemCVerification/2.0.1@minres/stable
SystemC-CCI/1.0.0@minres/stable SystemC-CCI/1.0.0@minres/stable
#fbrdb/0.1.0@minres/testing
tcc/0.9.27@minres/stable
[generators] [generators]
cmake cmake
@ -18,3 +20,5 @@
SystemCVerification:shared=True SystemCVerification:shared=True
SystemC-CCI:stdcxx=11 SystemC-CCI:stdcxx=11
SystemC-CCI:shared=True SystemC-CCI:shared=True
#fbrdb:stdcxx=11

2
dbt-core

@ -1 +1 @@
Subproject commit 04818dca7ddbb51c57e00f121880b748ff8369c7 Subproject commit 5b3fa18f8080c88c3e29ff51be435cc2747bcdd3

2
external/CMakeLists.txt vendored
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.3) cmake_minimum_required(VERSION 3.12)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/../cmake)
# Set the name of your project here # Set the name of your project here

2
platform/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.3) cmake_minimum_required(VERSION 3.12)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) # main (top) cmake dir set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) # main (top) cmake dir
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) # project specific cmake dir set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) # project specific cmake dir

2
platform/src/CMakeLists.txt
View File

@ -37,7 +37,7 @@ target_link_libraries(${LIBRARY_NAME} riscv_sc)
target_link_libraries(${LIBRARY_NAME} dbt-core) target_link_libraries(${LIBRARY_NAME} dbt-core)
target_link_libraries(${LIBRARY_NAME} softfloat) target_link_libraries(${LIBRARY_NAME} softfloat)
target_link_libraries(${LIBRARY_NAME} scc) target_link_libraries(${LIBRARY_NAME} scc)
target_link_libraries(${LIBRARY_NAME} ${CONAN_LIBS_SEASOCKS}) target_link_libraries(${LIBRARY_NAME} CONAN_PKG::Seasocks)
target_link_libraries(${LIBRARY_NAME} external) target_link_libraries(${LIBRARY_NAME} external)
target_link_libraries(${LIBRARY_NAME} ${llvm_libs}) target_link_libraries(${LIBRARY_NAME} ${llvm_libs})
target_link_libraries(${LIBRARY_NAME} ${Boost_LIBRARIES} ) target_link_libraries(${LIBRARY_NAME} ${Boost_LIBRARIES} )

2
riscv

@ -1 +1 @@
Subproject commit 15f4c059e6925885292bf552d4e367b754a5dd1e Subproject commit 50663a2fbc44888b3713f4ddae9b7b32e7bd7300

2
scc

@ -1 +1 @@
Subproject commit 86ce966985e9c8dd436ee0938922efa73fcf7c79 Subproject commit 531cd69b02d34303f585812acc133c5ed051a7c2