From: hcj <1224667075@qq.com> Date: Mon, 9 Sep 2024 12:47:19 +0000 (+0800) Subject: 修改msg_center CMake文件 X-Git-Tag: release_V1.2.70_20241020_135402~516^2~8 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=4470352a81cb38727c0a5d133017567568d6b398;p=mirrors%2FFD230.git 修改msg_center CMake文件 --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmPresenter.h index d972dfa65..0bcbac224 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmPresenter.h +++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmPresenter.h @@ -30,7 +30,7 @@ #include "AlarmClockModel.h" #include "wearable_log.h" #include "color.h" -#include "KeyInputListener.h" +// #include "KeyInputListener.h" #include "common/key_code.h" namespace OHOS { diff --git a/code/sdk/application/wearable/service/msg_center/CMakeLists.txt b/code/sdk/application/wearable/service/msg_center/CMakeLists.txt index 19029a0bb..7d580d33b 100644 --- a/code/sdk/application/wearable/service/msg_center/CMakeLists.txt +++ b/code/sdk/application/wearable/service/msg_center/CMakeLists.txt @@ -119,21 +119,22 @@ set(PUBLIC_HEADER ${CMAKE_CURRENT_SOURCE_DIR}/include/vendor_app ${CMAKE_CURRENT_SOURCE_DIR}/include/ota ) +if("FD230" IN_LIST DEFINES) set(PRIVATE_HEADER ${CMAKE_CURRENT_SOURCE_DIR}/../../fd230app/nativeui/callerlog/include - ${CMAKE_CURRENT_SOURCE_DIR}/../../nativeapp/nativeui/alarmclockmanage/include - ${CMAKE_CURRENT_SOURCE_DIR}/../../nativeapp/nativeui/alarmclocktimerconfig/include - ${CMAKE_CURRENT_SOURCE_DIR}/../../nativeapp/nativeui/alarm/include + ${CMAKE_CURRENT_SOURCE_DIR}/../../fd230app/nativeui/alarmclockmanage/include + ${CMAKE_CURRENT_SOURCE_DIR}/../../fd230app/nativeui/alarmclocktimerconfig/include + ${CMAKE_CURRENT_SOURCE_DIR}/../../fd230app/nativeui/alarm/include ${CMAKE_CURRENT_SOURCE_DIR}/../../fd230app/nativeui/system/include ${CMAKE_CURRENT_SOURCE_DIR}/../../fd230app/nativeui/sleep/include ${CMAKE_CURRENT_SOURCE_DIR}/../../fd230app/nativeui/producttest/include ${CMAKE_CURRENT_SOURCE_DIR}/../../fd230app/nativeui/phone/include ${CMAKE_CURRENT_SOURCE_DIR}/../../fd230app/nativeui/config/include - ${CMAKE_CURRENT_SOURCE_DIR}/../../nativeapp/nativeui/callerlog/include + ${CMAKE_CURRENT_SOURCE_DIR}/../../fd230app/nativeui/callerlog/include ${CMAKE_CURRENT_SOURCE_DIR}/../../fd230app/nativeui/phoneservice/include - ${CMAKE_CURRENT_SOURCE_DIR}/../../nativeapp/nativeui/phoneservice/include - ${CMAKE_CURRENT_SOURCE_DIR}/../../nativeapp/nativeui/main/include + ${CMAKE_CURRENT_SOURCE_DIR}/../../fd230app/nativeui/phoneservice/include + ${CMAKE_CURRENT_SOURCE_DIR}/../../fd230app/nativeui/main/include ${CMAKE_CURRENT_SOURCE_DIR}/../../fd230app/nativeui/main/include/dial ${CMAKE_CURRENT_SOURCE_DIR}/../../fd230app/nativeui/bloodoxygen/include ${CMAKE_CURRENT_SOURCE_DIR}/../../fd230app/nativeui/heartrate/include @@ -142,10 +143,45 @@ set(PRIVATE_HEADER ${CMAKE_CURRENT_SOURCE_DIR}/../../fd230app/nativeui/rtcservice/include ${CMAKE_CURRENT_SOURCE_DIR}/../../fd230app/nativeui/saveele/include/ ${CMAKE_CURRENT_SOURCE_DIR}/../../fd230app/nativeui/uiservice/include - ${CMAKE_CURRENT_SOURCE_DIR}/../../nativeapp/nativeui/player/include - ${CMAKE_CURRENT_SOURCE_DIR}/../../nativeapp/nativeui/bluetooth/include + ${CMAKE_CURRENT_SOURCE_DIR}/../../fd230app/nativeui/player/include + ${CMAKE_CURRENT_SOURCE_DIR}/../../fd230app/nativeui/bluetooth/include ${CMAKE_CURRENT_SOURCE_DIR}/../../fd230app/nativelauncher/include ${CMAKE_CURRENT_SOURCE_DIR}/../../fd230app/nativeui/goal/include + # ${CMAKE_CURRENT_SOURCE_DIR}/../../fd230app/nativelauncher/include + ${CMAKE_CURRENT_SOURCE_DIR}/../../ohos_deps + ${CMAKE_CURRENT_SOURCE_DIR}/../../CustomUIComponentTool/uicomponents/ + ${ROOT_DIR}/middleware/services/gui/uikit/proprietary/include + ${ROOT_DIR}/middleware/services/gui/uikit/proprietary/src/utils/innerkits + ${ROOT_DIR}/middleware/services/gui/uikit/ui/interfaces/innerkits + ${ROOT_DIR}/middleware/services/gui/uikit/utils/interfaces/innerkits + ${ROOT_DIR}/middleware/services/gui/uikit/utils/interfaces/kits + ${ROOT_DIR}/middleware/services/gui/uikit/utils/interfaces/kits/gfx_utils + ${ROOT_DIR}/middleware/services/gui/uikit/surface/interfaces/kits + ${ROOT_DIR}/middleware/services/gui/uikit/ui/frameworks + ${ROOT_DIR}/middleware/services/gui/uikit/proprietary/src/ui/frameworks/components_ext + ${ROOT_DIR}/open_source/openharmony/foundation/multimedia/audio_player/interfaces/kits + ${ROOT_DIR}/open_source/openharmony/foundation/multimedia/audiomanager/interfaces/kits/audiomanager + ${ROOT_DIR}/open_source/openharmony/foundation/multimedia/audiomanager/interfaces/kits/audiocommon + ${ROOT_DIR}/open_source/openharmony/drivers/peripheral/display/interfaces/include + ${ROOT_DIR}/open_source/openharmony/foundation/multimedia/player/interfaces/kits/ + ${ROOT_DIR}/open_source/openharmony/foundation/ace/ace_engine_lite/modules/baidumapcomponent + ${ROOT_DIR}/middleware/utils/fs/include/fs + ${ROOT_DIR}/include/middleware/services/bts/br + ${ROOT_DIR}/include/middleware/services/bts/common + ${ROOT_DIR}/application/auto_ota +) +else() + +set(PRIVATE_HEADER + + ${CMAKE_CURRENT_SOURCE_DIR}/../../nativeapp/nativeui/alarmclockmanage/include + ${CMAKE_CURRENT_SOURCE_DIR}/../../nativeapp/nativeui/alarmclocktimerconfig/include + ${CMAKE_CURRENT_SOURCE_DIR}/../../nativeapp/nativeui/alarm/include + ${CMAKE_CURRENT_SOURCE_DIR}/../../nativeapp/nativeui/callerlog/include + ${CMAKE_CURRENT_SOURCE_DIR}/../../nativeapp/nativeui/phoneservice/include + ${CMAKE_CURRENT_SOURCE_DIR}/../../nativeapp/nativeui/main/include + ${CMAKE_CURRENT_SOURCE_DIR}/../../nativeapp/nativeui/player/include + ${CMAKE_CURRENT_SOURCE_DIR}/../../nativeapp/nativeui/bluetooth/include ${CMAKE_CURRENT_SOURCE_DIR}/../../nativeapp/nativelauncher/include ${CMAKE_CURRENT_SOURCE_DIR}/../../ohos_deps ${CMAKE_CURRENT_SOURCE_DIR}/../../CustomUIComponentTool/uicomponents/ @@ -170,6 +206,7 @@ set(PRIVATE_HEADER ${ROOT_DIR}/application/auto_ota ) +endif() if("JS_ENABLE" IN_LIST DEFINES) set(SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/msg_center_customer.cpp