Skip to content

Commit 5bffe94

Browse files
committed
moves compile option to common where it belongs
1 parent c03b9b2 commit 5bffe94

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

src/common/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ target_include_directories(${PROJECT_NAME} PUBLIC
1111
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> # for headers when building
1212
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> # for client in install mode
1313
)
14+
if( NOT MSVC)
15+
# rigtorp/SPSCQueue.h uses std::hardware_destructive_interference_size which is HW dependend. GCC>14 warns about it
16+
target_compile_options(${PROJECT_NAME} PUBLIC -Wno-interference-size)
17+
endif()
1418
if(TARGET lz4::lz4)
1519
target_link_libraries(${PROJECT_NAME} PUBLIC lz4::lz4)
1620
endif()

src/sysc/CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ if(ZLIB_FOUND)
7575
list(APPEND LIB_SOURCES
7676
scc/scv/scv_tr_compressed.cpp
7777
scc/fst_trace.cpp
78-
scc/vcd_mt_trace.cpp
78+
# scc/vcd_mt_trace.cpp
7979
)
8080
set(WITH_FST ON)
8181
endif()
@@ -95,8 +95,6 @@ endif()
9595
if(SC_WITH_PHASE_CALLBACK_TRACING)
9696
target_compile_definitions(${PROJECT_NAME} PUBLIC WITH_SC_TRACING_PHASE_CALLBACKS)
9797
endif()
98-
# rigtorp/SPSCQueue.h uses std::hardware_destructive_interference_size which is HW dependend. GCC>14 warns about it
99-
target_compile_options(${PROJECT_NAME} PUBLIC -Wno-interference-size)
10098
target_include_directories (${PROJECT_NAME} PUBLIC
10199
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> # for headers when building
102100
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> # for client in install mode

0 commit comments

Comments
 (0)