makes verilator_custom shared to avoid collision of lz4 symbols

Minres · Dec 12, 2022 · b6aa07b · b6aa07b
1 parent abdbcd8
commit b6aa07b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/cmake/FindVerilator.cmake b/cmake/FindVerilator.cmake
@@ -70,19 +70,19 @@ set_source_files_properties(
 set(SOURCES 
     ${VERILATOR_INCLUDE_DIR}/verilated.cpp
     ${VERILATOR_INCLUDE_DIR}/verilated_cov.cpp
-    # ${VERILATOR_INCLUDE_DIR}/verilated_threads.cpp
+    #${VERILATOR_INCLUDE_DIR}/verilated_threads.cpp
     ${VERILATOR_INCLUDE_DIR}/verilated_dpi.cpp
     ${VERILATOR_INCLUDE_DIR}/verilated_vcd_c.cpp
     ${VERILATOR_INCLUDE_DIR}/verilated_vcd_sc.cpp
+    ${VERILATOR_INCLUDE_DIR}/verilated_fst_c.cpp
 )
 if(EXISTS ${VERILATOR_INCLUDE_DIR}/verilated_fst_sc.cpp)
     list(APPEND SOURCES
-        ${VERILATOR_INCLUDE_DIR}/verilated_fst_c.cpp
         ${VERILATOR_INCLUDE_DIR}/verilated_fst_sc.cpp
     )
 endif()
 
-add_library(verilated STATIC ${SOURCES})
+add_library(verilated SHARED ${SOURCES})
 
 set_target_properties(verilated PROPERTIES
     ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib
@@ -133,7 +133,7 @@ endif()
 target_link_libraries(verilated PUBLIC ${SystemC_LIBRARIES} )
 
 
-add_library(verilated_custom STATIC ${SOURCES})
+add_library(verilated_custom SHARED ${SOURCES})
 
 set_target_properties(verilated_custom PROPERTIES
     ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib

diff --git a/src/sysc/CMakeLists.txt b/src/sysc/CMakeLists.txt
@@ -141,7 +141,6 @@ if(WITH_FST)
     target_compile_definitions(${PROJECT_NAME} PUBLIC WITH_FST)
 endif()
 if(TARGET lz4::lz4)
-    target_compile_definitions(${PROJECT_NAME} PRIVATE WITH_LZ4)
     target_link_libraries(${PROJECT_NAME} PRIVATE lz4::lz4)
 endif()
 target_compile_definitions(${PROJECT_NAME} PRIVATE FMT_HEADER_ONLY)