fixed merge error

This commit is contained in:
mpilman 2019-04-16 17:43:46 -07:00
parent 96aaa31a6c
commit 57912b33a5
1 changed files with 2 additions and 2 deletions

View File

@ -179,11 +179,11 @@ add_library(fdb_sqlite STATIC
sqlite/sqliteInt.h
sqlite/sqliteLimit.h
sqlite/sqlite3.amalgamation.c)
target_compile_definitions(fdb_sqlite PRIVATE $<$<CONFIG:Debug>:NDEBUG>)
# Suppress warnings in sqlite since it's third party
if(NOT WIN32)
target_compile_options(sqlite BEFORE PRIVATE -w) # disable warnings for third party
target_compile_definitions(fdb_sqlite PRIVATE $<$<CONFIG:Debug>:NDEBUG>)
target_compile_options(fdb_sqlite BEFORE PRIVATE -w) # disable warnings for third party
endif()
set(java_workload_docstring "Build the Java workloads (makes fdbserver link against JNI)")