From 1f9263d69cb7ce2960c514c45ccca9ff85e67d0a Mon Sep 17 00:00:00 2001 From: hanlu Date: Mon, 8 Aug 2022 16:42:01 +0800 Subject: [PATCH] fix Signed-off-by: hanlu --- CMakeLists.txt | 1 + data_share/CMakeLists.txt | 1 + kv_store/CMakeLists.txt | 1 + mock/CMakeLists.txt | 1 + mock/innerkits/distributeddatamgr/dfx/reporter.h | 2 +- mock/src/mock_reporter.cpp | 2 +- preferences/CMakeLists.txt | 3 ++- relational_store/CMakeLists.txt | 1 + utils_native/CMakeLists.txt | 4 +++- 9 files changed, 12 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 22289d51..3619645d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,6 +20,7 @@ set(CMAKE_CXX_FLAGS "-std=c++1y -fno-rtti -fvisibility=default -D_GNU_SOURCE") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdata-sections -fPIC -fpic -ffunction-sections -D_GLIBC_MOCK") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--no-as-needed -ldl") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wsign-compare -Wimplicit-fallthrough") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat=0") add_subdirectory(googletest) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/utils_native/base/include) diff --git a/data_share/CMakeLists.txt b/data_share/CMakeLists.txt index 39b62fe3..014e8074 100644 --- a/data_share/CMakeLists.txt +++ b/data_share/CMakeLists.txt @@ -5,6 +5,7 @@ set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_FLAGS "-std=c++1y -fno-rtti -fvisibility=default -D_GNU_SOURCE") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdata-sections -fPIC -fpic -ffunction-sections -D_GLIBC_MOCK") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--no-as-needed -ldl") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat=0") set(MOCK_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../mock) add_definitions(-DNAPI_EXPERIMENTAL) diff --git a/kv_store/CMakeLists.txt b/kv_store/CMakeLists.txt index 6df8e63a..0350156c 100644 --- a/kv_store/CMakeLists.txt +++ b/kv_store/CMakeLists.txt @@ -5,6 +5,7 @@ set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_FLAGS "-std=c++1y -fno-rtti -fvisibility=default -D_GNU_SOURCE") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdata-sections -fPIC -fpic -ffunction-sections -D_GLIBC_MOCK") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--no-as-needed -ldl") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat=0") set(MOCK_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../mock) #aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR}/frameworks/native/kv_store/src/kvstore_common kv_store_src) diff --git a/mock/CMakeLists.txt b/mock/CMakeLists.txt index afb87cf8..92bb7858 100644 --- a/mock/CMakeLists.txt +++ b/mock/CMakeLists.txt @@ -7,6 +7,7 @@ set(CMAKE_CXX_FLAGS "-std=c++1y -fno-rtti -fvisibility=default -D_GNU_SOURCE") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -fpic -fdata-sections -ffunction-sections -D_GLIBC_MOCK") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-Bsymbolic -Wl,--no-as-needed -ldl") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-macro-redefined -Wno-constant-conversion -Wno-sign-compare") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat=0") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-incompatible-pointer-types") add_definitions(-DNDEBUG=1 -DHAVE_USLEEP=1 -DSQLITE_HAVE_ISNAN -DSQLITE_DEFAULT_JOURNAL_SIZE_LIMIT=1048576) add_definitions(-DSQLITE_THREADSAFE=2 -DSQLITE_TEMP_STORE=3 -DSQLITE_POWERSAFE_OVERWRITE=1) diff --git a/mock/innerkits/distributeddatamgr/dfx/reporter.h b/mock/innerkits/distributeddatamgr/dfx/reporter.h index 8adb5bd6..4c286e9d 100644 --- a/mock/innerkits/distributeddatamgr/dfx/reporter.h +++ b/mock/innerkits/distributeddatamgr/dfx/reporter.h @@ -38,7 +38,7 @@ public: KVSTORE_API StatisticReporter* TrafficStatistic(); KVSTORE_API StatisticReporter* ApiPerformanceStatistic(); - KVSTORE_API BehaviourReporter* BehaviourReporter(); + KVSTORE_API BehaviourReporter* GetBehaviourReporter(); }; } // namespace DistributedDataDfx } // namespace OHOS diff --git a/mock/src/mock_reporter.cpp b/mock/src/mock_reporter.cpp index e33ae53f..df4ccf03 100644 --- a/mock/src/mock_reporter.cpp +++ b/mock/src/mock_reporter.cpp @@ -110,7 +110,7 @@ StatisticReporter *Reporter::ApiPerformanceStatistic() return &reporter; } -BehaviourReporter *Reporter::BehaviourReporter() +BehaviourReporter *Reporter::GetBehaviourReporter() { class IBehaviourReporter : public BehaviourReporter { public: diff --git a/preferences/CMakeLists.txt b/preferences/CMakeLists.txt index 8d8d6a0c..262041bf 100644 --- a/preferences/CMakeLists.txt +++ b/preferences/CMakeLists.txt @@ -5,6 +5,7 @@ set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_FLAGS "-std=c++1y -fno-rtti -fvisibility=default -D_GNU_SOURCE") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdata-sections -fPIC -fpic -ffunction-sections -D_GLIBC_MOCK") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--no-as-needed -ldl") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat=0") set(MOCK_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../mock) add_definitions(-DNAPI_EXPERIMENTAL) @@ -18,6 +19,6 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../utils_native/base/include) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../utils_native/safwk/native/include) include(${MOCK_DIR}/include/CMakeLists.txt OPTIONAL) -set(links secure mock relational_store) +set(links secure mock relational_store xml2) add_library(preferences SHARED ${preferences_src}) target_link_libraries(preferences ${links}) \ No newline at end of file diff --git a/relational_store/CMakeLists.txt b/relational_store/CMakeLists.txt index ed590cca..915232eb 100644 --- a/relational_store/CMakeLists.txt +++ b/relational_store/CMakeLists.txt @@ -5,6 +5,7 @@ set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_FLAGS "-std=c++1y -fno-rtti -fvisibility=default -D_GNU_SOURCE") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdata-sections -fPIC -fpic -ffunction-sections -D_GLIBC_MOCK") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--no-as-needed -ldl") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat=0") set(MOCK_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../mock) add_definitions(-DNAPI_EXPERIMENTAL) diff --git a/utils_native/CMakeLists.txt b/utils_native/CMakeLists.txt index 7b9fce55..230865d8 100644 --- a/utils_native/CMakeLists.txt +++ b/utils_native/CMakeLists.txt @@ -9,4 +9,6 @@ aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR}/base/src/securec secureSrc) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/base/include) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/base/src) -add_library(secure SHARED ${secureSrc}) \ No newline at end of file +set(links rt) +add_library(secure SHARED ${secureSrc}) +target_link_libraries(secure ${links}) \ No newline at end of file -- Gitee