Skip to content

Commit 2b414de

Browse files
wangrong1069deepin-bot[bot]
authored andcommitted
chore: Update compiler flags for security enhancements
As title Log: Update compiler flags for security enhancements Bug: https://pms.uniontech.com/bug-view-342665.html
1 parent e5f7df7 commit 2b414de

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

CMakeLists.txt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,17 @@ set(CMAKE_AUTORCC ON)
88
set(CMAKE_CXX_STANDARD 17)
99
set(CMAKE_CXX_STANDARD_REQUIRED ON)
1010

11+
if(CMAKE_BUILD_TYPE STREQUAL "Release")
12+
message("Enable build hardening.")
13+
14+
set(CMAKE_VERBOSE_MAKEFILE ON)
15+
16+
set(HARDENING_FLAGS "-Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -ffile-prefix-map=${CMAKE_SOURCE_DIR}=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security")
17+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${HARDENING_FLAGS}")
18+
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${HARDENING_FLAGS}")
19+
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,relro -Wl,-z,now")
20+
endif()
21+
1122
include_directories(${PROJECT_BINARY_DIR})
1223
configure_file(${PROJECT_SOURCE_DIR}/config.h.in ${PROJECT_BINARY_DIR}/config.h @ONLY)
1324

src/CMakeLists.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,6 @@ if (${CMAKE_BUILD_TYPE} MATCHES "Debug")
9898
TARGET_COMPILE_DEFINITIONS(${BIN_NAME} PRIVATE $<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:QT_QML_DEBUG>)
9999
endif ()
100100

101-
set_target_properties(${BIN_NAME} PROPERTIES INSTALL_RPATH ${DTK_QML_APP_PLUGIN_PATH})
102-
103101
set(PREFIX ${CMAKE_INSTALL_PREFIX})
104102
set(AppIconDir ${PREFIX}/share/icons/hicolor/scalable/apps)
105103
set(APPSHAREDIR ${CMAKE_INSTALL_PREFIX}/share/${CMAKE_PROJECT_NAME})
@@ -110,9 +108,6 @@ install(FILES ${PROJECT_SOURCE_DIR}/src/${CMAKE_PROJECT_NAME}.desktop DESTINATIO
110108
install(FILES ${PROJECT_SOURCE_DIR}/src/icon/deepin-album.svg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps)
111109
install(FILES com.deepin.album.service DESTINATION ${CMAKE_INSTALL_PREFIX}/share/dbus-1/services/)
112110

113-
install(TARGETS ${LIB_NAME} DESTINATION ${DTK_QML_APP_PLUGIN_PATH})
114-
install(TARGETS ${LIB_NAME} DESTINATION ${PREFIX}/plugins/imageformats)
115-
116111
#translations
117112
install(DIRECTORY ${PROJECT_SOURCE_DIR}/translations
118113
DESTINATION ${APPSHAREDIR}

0 commit comments

Comments
 (0)