diff --git a/CMakeLists.txt b/CMakeLists.txt index c934ee6..2fa7da2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) project(RISCV-VP LANGUAGES CXX) @@ -58,7 +58,7 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") set(warnings "/W4 /WX /EHsc") endif() -setup_conan(Release) +setup_conan(TARGETS) # 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. diff --git a/conanfile.txt b/conanfile.txt index 157cc85..8bb57f1 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -5,7 +5,9 @@ SystemC/2.3.3@minres/stable SystemCVerification/2.0.1@minres/stable SystemC-CCI/1.0.0@minres/stable - + #fbrdb/0.1.0@minres/testing + tcc/0.9.27@minres/stable + [generators] cmake @@ -18,3 +20,5 @@ SystemCVerification:shared=True SystemC-CCI:stdcxx=11 SystemC-CCI:shared=True + #fbrdb:stdcxx=11 + diff --git a/dbt-core b/dbt-core index 04818dc..5b3fa18 160000 --- a/dbt-core +++ b/dbt-core @@ -1 +1 @@ -Subproject commit 04818dca7ddbb51c57e00f121880b748ff8369c7 +Subproject commit 5b3fa18f8080c88c3e29ff51be435cc2747bcdd3 diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 34c7ad1..6726dd1 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -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 the name of your project here diff --git a/platform/CMakeLists.txt b/platform/CMakeLists.txt index 74867d9..9f7e56e 100644 --- a/platform/CMakeLists.txt +++ b/platform/CMakeLists.txt @@ -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) # project specific cmake dir diff --git a/platform/src/CMakeLists.txt b/platform/src/CMakeLists.txt index ae0b6c4..6ae0877 100644 --- a/platform/src/CMakeLists.txt +++ b/platform/src/CMakeLists.txt @@ -37,7 +37,7 @@ target_link_libraries(${LIBRARY_NAME} riscv_sc) target_link_libraries(${LIBRARY_NAME} dbt-core) target_link_libraries(${LIBRARY_NAME} softfloat) 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} ${llvm_libs}) target_link_libraries(${LIBRARY_NAME} ${Boost_LIBRARIES} ) diff --git a/riscv b/riscv index 15f4c05..50663a2 160000 --- a/riscv +++ b/riscv @@ -1 +1 @@ -Subproject commit 15f4c059e6925885292bf552d4e367b754a5dd1e +Subproject commit 50663a2fbc44888b3713f4ddae9b7b32e7bd7300 diff --git a/scc b/scc index 86ce966..531cd69 160000 --- a/scc +++ b/scc @@ -1 +1 @@ -Subproject commit 86ce966985e9c8dd436ee0938922efa73fcf7c79 +Subproject commit 531cd69b02d34303f585812acc133c5ed051a7c2