diff --git a/.cproject b/.cproject
index 4d76c43..67a12ff 100644
--- a/.cproject
+++ b/.cproject
@@ -32,6 +32,7 @@
+
@@ -152,6 +155,7 @@
+
@@ -245,6 +249,55 @@
+
+
+
+ make
+
+ all VERBOSE=1
+ true
+ false
+ true
+
+
+ make
+ -j8
+ clean
+ true
+ true
+ true
+
+
+ make
+ -j8
+ all
+ true
+ true
+ true
+
+
+ make
+ clangformat
+ true
+ true
+ true
+
+
+ make
+ riscv
+ true
+ true
+ true
+
+
+ make
+ riscv.sc
+ true
+ true
+ true
+
+
+
@@ -253,16 +306,10 @@
-
-
-
-
-
-
-
+
@@ -274,63 +321,26 @@
+
+
+
+
+
+
-
+
+
+
+
-
-
-
-
- make
- all VERBOSE=1
- true
- true
- true
-
-
- make
- clean
- true
- true
- true
-
-
- make
- all
- true
- true
- true
-
-
- make
-
- clangformat
- true
- true
- true
-
-
- make
-
- riscv
- true
- true
- true
-
-
- make
-
- riscv.sc
- true
- true
- true
-
-
+
+
+
diff --git a/cmake/Conan.cmake b/cmake/Conan.cmake
index 42e5ce1..bd0fda7 100644
--- a/cmake/Conan.cmake
+++ b/cmake/Conan.cmake
@@ -23,14 +23,15 @@ macro(setup_conan)
set(conanfile ${CMAKE_SOURCE_DIR}/conanfile.txt)
set(conanfile_cmake ${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
+ set(compiler_libcxx libstdc++11)
if(${CMAKE_BUILD_TYPE} STREQUAL RelWithDebInfo)
execute_process(COMMAND ${conan} install --build=missing
- -s build_type=Release
+ -s build_type=Release -s compiler.libcxx=${compiler_libcxx}
${CMAKE_SOURCE_DIR} RESULT_VARIABLE return_code)
else()
execute_process(COMMAND ${conan} install --build=missing
- -s build_type=${CMAKE_BUILD_TYPE}
+ -s build_type=${CMAKE_BUILD_TYPE} -s compiler.libcxx=${compiler_libcxx}
${CMAKE_SOURCE_DIR} RESULT_VARIABLE return_code)
endif()
if(NOT ${return_code} EQUAL 0)
@@ -38,5 +39,5 @@ macro(setup_conan)
endif()
include(${conanfile_cmake})
- conan_basic_setup(TARGETS)
+ conan_basic_setup(TARGETS)
endmacro()
\ No newline at end of file
diff --git a/conanfile.txt b/conanfile.txt
index 0e196e1..81f77c2 100644
--- a/conanfile.txt
+++ b/conanfile.txt
@@ -1,15 +1,15 @@
[requires]
-Poco/1.7.8p3@pocoproject/stable
-Seasocks/1.3.2@minres/stable
-SystemC/2.3.2@minres/stable
-SystemCVerification/2.0.0a@minres/stable
+ Poco/1.7.8p3@pocoproject/stable
+ Seasocks/1.3.2@minres/stable
+ SystemC/2.3.2@minres/stable
+ SystemCVerification/2.0.0a@minres/stable
[generators]
-cmake
-txt
+ cmake
+ txt
[options]
-Poco:shared=True
-Seasocks:shared=False
-SystemC:stdcxx=14
-SystemCVerification:stdcxx=14
\ No newline at end of file
+ Poco:shared=True
+ Seasocks:shared=False
+ SystemC:stdcxx=14
+ SystemCVerification:stdcxx=14
\ No newline at end of file
diff --git a/riscv.sc/incl/sysc/sc_comm_singleton.h b/riscv.sc/incl/sysc/sc_comm_singleton.h
index b89afc6..d6c4aa9 100644
--- a/riscv.sc/incl/sysc/sc_comm_singleton.h
+++ b/riscv.sc/incl/sysc/sc_comm_singleton.h
@@ -15,6 +15,7 @@
#include
#include
#include
+#include
namespace sysc {
diff --git a/riscv.sc/src/CMakeLists.txt b/riscv.sc/src/CMakeLists.txt
index c708c19..f097e83 100644
--- a/riscv.sc/src/CMakeLists.txt
+++ b/riscv.sc/src/CMakeLists.txt
@@ -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} )