Skip to content

Commit 07a4776

Browse files
deepin-ci-robot18202781743
authored andcommitted
sync: from linuxdeepin/dtkdeclarative
Synchronize source files from linuxdeepin/dtkdeclarative. Source-pull-request: linuxdeepin/dtkdeclarative#501
1 parent 1cf0e68 commit 07a4776

4 files changed

Lines changed: 19 additions & 2 deletions

File tree

CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,7 @@ if(TARGET Qt6::QuickControls2 AND TARGET Qt6::QuickControls2Private)
7171
endif()
7272
endif()
7373

74-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -Wall -Wextra")
75-
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--as-needed")
74+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -Wextra")
7675
if (CMAKE_BUILD_TYPE STREQUAL "Debug")
7776
# 加上 ASAN 检查后可能会导致 DEBUG 应用启动后退出。可以加上 ASAN_OPTIONS 环境变量来防止应用退出
7877
# ASAN_OPTIONS="halt_on_error=0" ASAN_OPTIONS="new_delete_type_mismatch=0"

qt6/src/CMakeLists.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,12 @@ target_link_libraries(${PLUGIN_NAME} PRIVATE
7070
${LIB_NAME}
7171
)
7272

73+
# 禁用此插件的 RPATH/RUNPATH,因为依赖库在标准系统路径中
74+
set_target_properties(${PLUGIN_NAME} PROPERTIES
75+
INSTALL_RPATH ""
76+
BUILD_WITH_INSTALL_RPATH TRUE
77+
)
78+
7379
# Install library
7480
install(TARGETS ${LIB_NAME} EXPORT Dtk${DTK_VERSION_MAJOR}DeclarativeTargets DESTINATION "${LIB_INSTALL_DIR}")
7581
# Install export targets

qt6/src/qml/private/CMakeLists.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,11 @@ PRIVATE
2626
Qt${QT_VERSION_MAJOR}::Quick
2727
)
2828

29+
# 禁用此插件的 RPATH/RUNPATH,因为依赖库在标准系统路径中
30+
set_target_properties(dtkdeclarativeprivatesplugin PROPERTIES
31+
INSTALL_RPATH ""
32+
BUILD_WITH_INSTALL_RPATH TRUE
33+
)
34+
2935
install(TARGETS dtkdeclarativeprivatesplugin DESTINATION "${QML_INSTALL_DIR}/${URI_PATH}/private")
3036
install(DIRECTORY "${PLUGIN_OUTPUT_DIR}/${URI_PATH}/private/" DESTINATION "${QML_INSTALL_DIR}/${URI_PATH}/private")

qt6/src/qml/settings/CMakeLists.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,11 @@ PRIVATE
3535
${LIB_NAME}
3636
)
3737

38+
# 禁用此插件的 RPATH/RUNPATH,因为依赖库在标准系统路径中
39+
set_target_properties(dtkdeclarativesettingsplugin PROPERTIES
40+
INSTALL_RPATH ""
41+
BUILD_WITH_INSTALL_RPATH TRUE
42+
)
43+
3844
install(TARGETS dtkdeclarativesettingsplugin DESTINATION "${QML_INSTALL_DIR}/${URI_PATH}/settings")
3945
install(DIRECTORY "${PLUGIN_OUTPUT_DIR}/${URI_PATH}/settings/" DESTINATION "${QML_INSTALL_DIR}/${URI_PATH}/settings")

0 commit comments

Comments
 (0)