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

Cleanup dependencies

This commit is contained in:
Eyck Jentzsch 2019-06-18 19:21:51 +00:00
parent d20564c135
commit 9ba1482fc2
6 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -60,7 +60,6 @@ setup_conan()
# 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.
find_package(Boost COMPONENTS program_options system thread filesystem REQUIRED)
if(DEFINED ENV{LLVM_HOME}) if(DEFINED ENV{LLVM_HOME})
find_path (LLVM_DIR LLVM-Config.cmake $ENV{LLVM_HOME}/lib/cmake/llvm) find_path (LLVM_DIR LLVM-Config.cmake $ENV{LLVM_HOME}/lib/cmake/llvm)
@ -70,6 +69,8 @@ message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}") message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}")
llvm_map_components_to_libnames(llvm_libs support core mcjit x86codegen x86asmparser) llvm_map_components_to_libnames(llvm_libs support core mcjit x86codegen x86asmparser)
set(BUILD_SHARED_LIBS 1)
find_package(Threads) find_package(Threads)
find_package(Tcmalloc) find_package(Tcmalloc)
find_package(ZLIB) find_package(ZLIB)

2
dbt-core

@ -1 +1 @@
Subproject commit c449c3c0c8670addfa2e76cecd03d75764f17656 Subproject commit a16e635fadc673d34b16916f066dfa2ba6cf2be2

3
platform/CMakeLists.txt
View File

@ -11,6 +11,9 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
project("platform") project("platform")
include(Common) include(Common)
find_package(Boost COMPONENTS program_options system thread filesystem REQUIRED)
# check that we have averything we need # check that we have averything we need
if(!SystemC_FOUND) if(!SystemC_FOUND)
message( FATAL_ERROR "SystemC library not found." ) message( FATAL_ERROR "SystemC library not found." )

2
platform/src/CMakeLists.txt
View File

@ -30,7 +30,7 @@ set(LIBRARY_NAME platform)
#add_definitions(-DSC_DEFAULT_WRITER_POLICY=SC_MANY_WRITERS) #add_definitions(-DSC_DEFAULT_WRITER_POLICY=SC_MANY_WRITERS)
# Define the library # Define the library
add_library(${LIBRARY_NAME} SHARED ${LIB_SOURCES}) add_library(${LIBRARY_NAME} ${LIB_SOURCES})
# Links the target exe against the libraries # Links the target exe against the libraries
target_link_libraries(${LIBRARY_NAME} riscv_sc) target_link_libraries(${LIBRARY_NAME} riscv_sc)

2
riscv

@ -1 +1 @@
Subproject commit 2758933c16a6a0d8b5ade685b0ceb44a329343be Subproject commit d93c2feec4c80ece0773fb2366821d01e11db4b6

2
scc

@ -1 +1 @@
Subproject commit 6df4ea9df4f379a2ab5903258f8bd7e72c74ffce Subproject commit 4be77aff604dc78f3c0856b6d17843b276b80b59