Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/candidate-9.2.x' into candidate-…
Browse files Browse the repository at this point in the history
…9.4.x

Signed-off-by: Gavin Halliday <[email protected]>
  • Loading branch information
ghalliday committed May 23, 2024
2 parents 3741008 + 491b0f9 commit dec7c91
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions plugins/Rembed/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ if(REMBED)
./../../system/mp
./../../system/jlib)

set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wno-error=format-nonliteral")
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=format-nonliteral")
set_property (SOURCE Rembed.cpp APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-format-nonliteral")
set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wno-error=format-nonliteral -Wno-error=format-security -Wno-error=format=")
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=format-nonliteral -Wno-error=format-security -Wno-error=format=")
set_property (SOURCE Rembed.cpp APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-format-nonliteral -Wno-format-security -Wno-error-format=")
add_definitions(-D_USRDLL -DREMBED_EXPORTS)
if(RCPP_LIBRARY STREQUAL "")
add_definitions(-DRCPP_HEADER_ONLY)
Expand Down Expand Up @@ -77,4 +77,4 @@ if(PLATFORM OR CLIENTTOOLS_ONLY)
FILES ${CMAKE_CURRENT_SOURCE_DIR}/R.ecllib
DESTINATION plugins
COMPONENT Runtime)
endif()
endif()

0 comments on commit dec7c91

Please sign in to comment.