Skip to content

Commit c23abe9

Browse files
levlamlevlam
committed
Fix building of gperf-generated files with C++17.
1 parent 5beadff commit c23abe9

2 files changed

Lines changed: 3 additions & 13 deletions

File tree

‎tdutils/CMakeLists.txt‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,7 @@ if (CLANG OR GCC)
5050
elseif (MSVC)
5151
set_property(SOURCE ${TDMIME_AUTO} APPEND_STRING PROPERTY COMPILE_FLAGS " /wd4267")
5252
endif()
53-
if (CLANG)
54-
set_property(SOURCE ${TDMIME_AUTO} APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-deprecated-register")
55-
endif()
53+
set_property(SOURCE ${TDMIME_AUTO} APPEND PROPERTY COMPILE_DEFINITIONS "__gnu_inline__=;register=")
5654

5755
set(TDUTILS_SOURCE
5856
td/utils/port/Clocks.cpp

‎tdutils/generate/CMakeLists.txt‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,23 +44,15 @@ if (NOT CMAKE_CROSSCOMPILING)
4444
DEPENDS generate_mime_types_gperf mime_types.txt
4545
)
4646

47-
if (CMAKE_HOST_WIN32)
48-
set(MIME_TYPE_TO_EXTENSION_CMD ${GPERF_EXECUTABLE} -m100 --output-file=auto/mime_type_to_extension.cpp auto/mime_type_to_extension.gperf)
49-
else()
50-
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)
51-
endif()
47+
set(MIME_TYPE_TO_EXTENSION_CMD ${GPERF_EXECUTABLE} -m100 --output-file=auto/mime_type_to_extension.cpp auto/mime_type_to_extension.gperf)
5248
add_custom_command(
5349
OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/auto/mime_type_to_extension.cpp
5450
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
5551
COMMAND ${MIME_TYPE_TO_EXTENSION_CMD}
5652
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/auto/mime_type_to_extension.gperf
5753
)
5854

59-
if (CMAKE_HOST_WIN32)
60-
set(EXTENSION_TO_MIME_TYPE_CMD ${GPERF_EXECUTABLE} -m100 --output-file=auto/extension_to_mime_type.cpp auto/extension_to_mime_type.gperf)
61-
else()
62-
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)
63-
endif()
55+
set(EXTENSION_TO_MIME_TYPE_CMD ${GPERF_EXECUTABLE} -m100 --output-file=auto/extension_to_mime_type.cpp auto/extension_to_mime_type.gperf)
6456
add_custom_command(
6557
OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/auto/extension_to_mime_type.cpp
6658
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}

0 commit comments

Comments
 (0)