diff options
| author | levlam <levlam@telegram.org> | 2025-02-13 21:09:50 +0300 |
|---|---|---|
| committer | levlam <levlam@telegram.org> | 2025-02-13 21:09:50 +0300 |
| commit | c23abe99eff56620fb690aa23b1ae64a3a448bd1 (patch) | |
| tree | 66d669bb279b48b0bf37c8bd79154ecf0dbc21ea /tdutils | |
| parent | 5beadff4489b4e71246208f7c866ed4650d69d77 (diff) | |
Fix building of gperf-generated files with C++17.
Diffstat (limited to 'tdutils')
| -rw-r--r-- | tdutils/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tdutils/generate/CMakeLists.txt | 12 |
2 files changed, 3 insertions, 13 deletions
diff --git a/tdutils/CMakeLists.txt b/tdutils/CMakeLists.txt index 77d0d14cd..026ee2a56 100644 --- a/tdutils/CMakeLists.txt +++ b/tdutils/CMakeLists.txt @@ -50,9 +50,7 @@ if (CLANG OR GCC) elseif (MSVC) set_property(SOURCE ${TDMIME_AUTO} APPEND_STRING PROPERTY COMPILE_FLAGS " /wd4267") endif() -if (CLANG) - set_property(SOURCE ${TDMIME_AUTO} APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-deprecated-register") -endif() +set_property(SOURCE ${TDMIME_AUTO} APPEND PROPERTY COMPILE_DEFINITIONS "__gnu_inline__=;register=") set(TDUTILS_SOURCE td/utils/port/Clocks.cpp diff --git a/tdutils/generate/CMakeLists.txt b/tdutils/generate/CMakeLists.txt index f89d9059f..389f553f6 100644 --- a/tdutils/generate/CMakeLists.txt +++ b/tdutils/generate/CMakeLists.txt @@ -44,11 +44,7 @@ if (NOT CMAKE_CROSSCOMPILING) DEPENDS generate_mime_types_gperf mime_types.txt ) - if (CMAKE_HOST_WIN32) - set(MIME_TYPE_TO_EXTENSION_CMD ${GPERF_EXECUTABLE} -m100 --output-file=auto/mime_type_to_extension.cpp auto/mime_type_to_extension.gperf) - else() - set(MIME_TYPE_TO_EXTENSION_CMD ${GPERF_EXECUTABLE} -m100 auto/mime_type_to_extension.gperf | grep -v __gnu_inline__ > auto/mime_type_to_extension.cpp) - endif() + set(MIME_TYPE_TO_EXTENSION_CMD ${GPERF_EXECUTABLE} -m100 --output-file=auto/mime_type_to_extension.cpp auto/mime_type_to_extension.gperf) add_custom_command( OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/auto/mime_type_to_extension.cpp WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} @@ -56,11 +52,7 @@ if (NOT CMAKE_CROSSCOMPILING) DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/auto/mime_type_to_extension.gperf ) - if (CMAKE_HOST_WIN32) - set(EXTENSION_TO_MIME_TYPE_CMD ${GPERF_EXECUTABLE} -m100 --output-file=auto/extension_to_mime_type.cpp auto/extension_to_mime_type.gperf) - else() - set(EXTENSION_TO_MIME_TYPE_CMD ${GPERF_EXECUTABLE} -m100 auto/extension_to_mime_type.gperf | grep -v __gnu_inline__ > auto/extension_to_mime_type.cpp) - endif() + set(EXTENSION_TO_MIME_TYPE_CMD ${GPERF_EXECUTABLE} -m100 --output-file=auto/extension_to_mime_type.cpp auto/extension_to_mime_type.gperf) add_custom_command( OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/auto/extension_to_mime_type.cpp WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} |