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

Fixed CMake/conan.io setup now woring in a different environment

Browse Source
This commit is contained in:
Eyck Jentzsch
2017-11-16 00:37:10 +01:00
parent eced81b5ea
commit 7512aad118
5 changed files with 87 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
riscv.sc/incl/sysc/sc_comm_singleton.h
View File

@ -15,6 +15,7 @@
#include <memory>
#include <thread>
#include <cstring>
#include <functional>
namespace sysc {

6
riscv.sc/src/CMakeLists.txt
View File

@ -26,7 +26,11 @@ set_target_properties(${LIBRARY_NAME} PROPERTIES
# This is a make target, so you can do a "make riscv-sc"
set(APPLICATION_NAME riscv.sc)
include_directories(${CONAN_INCLUDE_DIRS_SEASOCKS})
include_directories(${SystemC_INCLUDE_DIRS})
link_directories(${SystemC_LIBRARY_DIR})
link_directories(${CONAN_LIB_DIRS_SEASOCKS})
add_executable(${APPLICATION_NAME} ${APP_SOURCES})
@ -36,7 +40,7 @@ target_link_libraries(${APPLICATION_NAME} ${LIBRARY_NAME})
target_link_libraries(${APPLICATION_NAME} risc-v)
target_link_libraries(${APPLICATION_NAME} dbt-core)
target_link_libraries(${APPLICATION_NAME} sc-components)
target_link_libraries(${APPLICATION_NAME} CONAN_PKG::Seasocks)
target_link_libraries(${APPLICATION_NAME} ${CONAN_LIBS_SEASOCKS})
target_link_libraries(${APPLICATION_NAME} external)
target_link_libraries(${APPLICATION_NAME} ${llvm_libs})
target_link_libraries(${APPLICATION_NAME} ${SystemC_LIBRARIES} )