Browse Source

Cleanup dependencies

Eyck Jentzsch 4 months ago
parent
commit
d93c2feec4
1 changed files with 6 additions and 3 deletions
  1. 6
    3
      CMakeLists.txt

+ 6
- 3
CMakeLists.txt View File

@@ -14,6 +14,8 @@ include(Common)
14 14
 
15 15
 conan_basic_setup()
16 16
 
17
+find_package(Boost COMPONENTS program_options system thread filesystem REQUIRED)
18
+
17 19
 # This sets the include directory for the reference project. This is the -I flag in gcc.
18 20
 include_directories(
19 21
     ${PROJECT_SOURCE_DIR}/incl
@@ -62,7 +64,7 @@ add_library(${LIBRARY_NAME} ${LIB_SOURCES})
62 64
 SET(${LIBRARY_NAME} -Wl,-whole-archive -l${LIBRARY_NAME} -Wl,-no-whole-archive)
63 65
 target_link_libraries(${LIBRARY_NAME} softfloat)
64 66
 target_link_libraries(${LIBRARY_NAME} dbt-core)
65
-target_link_libraries(${LIBRARY_NAME} scc)
67
+target_link_libraries(${LIBRARY_NAME} scc-util)
66 68
 set_target_properties(${LIBRARY_NAME} PROPERTIES
67 69
   VERSION ${VERSION}  # ${VERSION} was defined in the main CMakeLists.
68 70
   FRAMEWORK FALSE
@@ -72,7 +74,7 @@ set_target_properties(${LIBRARY_NAME} PROPERTIES
72 74
 
73 75
 if(SystemC_FOUND)
74 76
 	set(SC_LIBRARY_NAME riscv_sc)
75
-	add_library(${SC_LIBRARY_NAME} SHARED src/sysc/core_complex.cpp)
77
+	add_library(${SC_LIBRARY_NAME} src/sysc/core_complex.cpp)
76 78
 	add_definitions(-DWITH_SYSTEMC) 
77 79
 	include_directories(${SystemC_INCLUDE_DIRS})
78 80
 	
@@ -96,6 +98,8 @@ if(SystemC_FOUND)
96 98
 	)
97 99
 endif()
98 100
 
101
+project("riscv-sim")
102
+
99 103
 # This is a make target, so you can do a "make riscv-sc"
100 104
 set(APPLICATION_NAME riscv-sim)
101 105
 
@@ -105,7 +109,6 @@ add_executable(${APPLICATION_NAME} src/main.cpp)
105 109
 target_link_libraries(${APPLICATION_NAME} ${LIBRARY_NAME})
106 110
 target_link_libraries(${APPLICATION_NAME} jsoncpp)
107 111
 target_link_libraries(${APPLICATION_NAME} dbt-core)
108
-target_link_libraries(${APPLICATION_NAME} softfloat)
109 112
 target_link_libraries(${APPLICATION_NAME} external)
110 113
 target_link_libraries(${APPLICATION_NAME} ${llvm_libs})
111 114
 target_link_libraries(${APPLICATION_NAME} ${Boost_LIBRARIES} )