Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2025-12-24 20:35:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixup: address 5258 code review (#5295)

Browse Source
This commit is contained in:
Charles Kerr
2023-03-27 11:04:10 -05:00
committed by GitHub
parent f4d74626c0
commit 47e141563a
2 changed files with 21 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
CMakeLists.txt
View File

@@ -56,7 +56,7 @@ option(ENABLE_WERROR "Treat warnings as errors" OFF)
option(ENABLE_NLS "Enable native language support" ON) option(ENABLE_NLS "Enable native language support" ON)
option(INSTALL_DOC "Build/install documentation" ON) option(INSTALL_DOC "Build/install documentation" ON)
option(INSTALL_LIB "Install the library" OFF) option(INSTALL_LIB "Install the library" OFF)
option(DISABLE_DEPRECATED "Set 'disable deprecated' option for upstream packages, e.g. GTK" AUTO) tr_auto_option(ENABLE_DEPRECATED "Allow deprecated API use of upstream packages, e.g. GTK" AUTO)
tr_auto_option(RUN_CLANG_TIDY "Run clang-tidy on the code" OFF) tr_auto_option(RUN_CLANG_TIDY "Run clang-tidy on the code" OFF)
tr_auto_option(USE_SYSTEM_EVENT2 "Use system event2 library" AUTO) tr_auto_option(USE_SYSTEM_EVENT2 "Use system event2 library" AUTO)
tr_auto_option(USE_SYSTEM_DEFLATE "Use system deflate library" AUTO) tr_auto_option(USE_SYSTEM_DEFLATE "Use system deflate library" AUTO)
@@ -216,12 +216,12 @@ if(NOT TARGET CURL::libcurl)
target_include_directories(CURL::libcurl INTERFACE ${CURL_INCLUDE_DIRS}) target_include_directories(CURL::libcurl INTERFACE ${CURL_INCLUDE_DIRS})
endif() endif()
if(DISABLE_DEPRECATED STREQUAL "AUTO") if(ENABLE_DEPRECATED STREQUAL "AUTO")
if(DEFINED ENV{CI}) if(DEFINED ENV{CI})
set(DISABLE_DEPRECATED ON) set(ENABLE_DEPRECATED OFF)
else() else()
set(DISABLE_DEPRECATED OFF) set(ENABLE_DEPRECATED ON)
endif() endif()
endif() endif()
set(CRYPTO_PKG "") set(CRYPTO_PKG "")

36
gtk/CMakeLists.txt
View File

@@ -158,30 +158,22 @@ target_compile_definitions(${TR_NAME}-gtk
PRIVATE PRIVATE
TRANSMISSIONLOCALEDIR="${CMAKE_INSTALL_FULL_LOCALEDIR}" TRANSMISSIONLOCALEDIR="${CMAKE_INSTALL_FULL_LOCALEDIR}"
GETTEXT_PACKAGE="${TR_NAME}-gtk" GETTEXT_PACKAGE="${TR_NAME}-gtk"
# FIXME: these break libnotify's headers
# G_DISABLE_SINGLE_INCLUDES
# GTK_DISABLE_SINGLE_INCLUDES
$<$<BOOL:${ENABLE_UTP}>:WITH_UTP>) $<$<BOOL:${ENABLE_UTP}>:WITH_UTP>)
if(DISABLE_DEPRECATED) if(NOT ENABLE_DEPRECATED)
target_compile_definitions(${TR_NAME}-gtk target_compile_definitions(${TR_NAME}-gtk
PRIVATE PRIVATE
TRANSMISSIONLOCALEDIR="${CMAKE_INSTALL_FULL_LOCALEDIR}" G_DISABLE_DEPRECATED
GETTEXT_PACKAGE="${TR_NAME}-gtk" GDK_PIXBUF_DISABLE_DEPRECATED
G_DISABLE_DEPRECATED GDK_DISABLE_DEPRECATED
GDK_PIXBUF_DISABLE_DEPRECATED GTK_DISABLE_DEPRECATED
GDK_DISABLE_DEPRECATED PANGO_DISABLE_DEPRECATED
GTK_DISABLE_DEPRECATED GDKMM_DISABLE_DEPRECATED
PANGO_DISABLE_DEPRECATED GIOMM_DISABLE_DEPRECATED
# FIXME: these break libnotify's headers GLIBMM_DISABLE_DEPRECATED
# G_DISABLE_SINGLE_INCLUDES GTKMM_DISABLE_DEPRECATED
# GTK_DISABLE_SINGLE_INCLUDES PANGOMM_DISABLE_DEPRECATED
GDKMM_DISABLE_DEPRECATED SIGCXX_DISABLE_DEPRECATED)
GIOMM_DISABLE_DEPRECATED
GLIBMM_DISABLE_DEPRECATED
GTKMM_DISABLE_DEPRECATED
PANGOMM_DISABLE_DEPRECATED
SIGCXX_DISABLE_DEPRECATED)
endif() endif()
target_compile_options(${TR_NAME}-gtk target_compile_options(${TR_NAME}-gtk