diff --git a/CMakeLists.txt b/CMakeLists.txt index ca03e573a..1e6519f5d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -245,7 +245,7 @@ else() set(USE_MACH_SEM 0) endif() if(CMAKE_SYSTEM_NAME STREQUAL Windows) - add_compile_definitions($<$,$>:USE_WIN32_SEM>) + add_compile_definitions($<$:USE_WIN32_SEM>) endif() check_library_exists(pthread sem_init "" USE_POSIX_SEM) # NOTE: android has not always provided a libpthread, but uses the pthreads API @@ -275,7 +275,7 @@ check_symbol_exists(VQ_FREE_SPACE_CHANGE "sys/mount.h" HAVE_DECL_VQ_FREE_SPACE_C check_symbol_exists(strlcpy "string.h" HAVE_STRLCPY) check_symbol_exists(program_invocation_name "errno.h" HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME) if (HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME) - add_compile_definitions($<$,$>:_GNU_SOURCE=1>) + add_compile_definitions($<$:_GNU_SOURCE=1>) endif() check_symbol_exists(__printflike "bsd/sys/cdefs.h" HAVE_PRINTFLIKE) @@ -284,7 +284,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL Android) endif() if(CMAKE_SYSTEM_NAME STREQUAL FreeBSD) - add_compile_definitions($<$,$>:_WITH_DPRINTF>) + add_compile_definitions($<$:_WITH_DPRINTF>) endif() if(ENABLE_DTRACE) @@ -295,9 +295,9 @@ if(ENABLE_DTRACE) endif() if(dtrace_EXECUTABLE) - add_compile_definitions($<$,$>:DISPATCH_USE_DTRACE=1>) + add_compile_definitions($<$:DISPATCH_USE_DTRACE=1>) else() - add_compile_definitions($<$,$>:DISPATCH_USE_DTRACE=0>) + add_compile_definitions($<$:DISPATCH_USE_DTRACE=0>) endif() find_program(leaks_EXECUTABLE leaks) @@ -307,16 +307,16 @@ endif() if(CMAKE_SYSTEM_NAME STREQUAL Darwin) - add_compile_options($<$,$>:-fmodule-map-file=${PROJECT_SOURCE_DIR}/dispatch/darwin/module.modulemap> - $<$,$>:-fmodule-map-file=${PROJECT_SOURCE_DIR}/private/darwin/module.modulemap>) + add_compile_options($<:$:-fmodule-map-file=${PROJECT_SOURCE_DIR}/dispatch/darwin/module.modulemap> + $<:$:-fmodule-map-file=${PROJECT_SOURCE_DIR}/private/darwin/module.modulemap>) else() - add_compile_options($<$,$>:-fmodule-map-file=${PROJECT_SOURCE_DIR}/dispatch/generic/module.modulemap> - $<$,$>:-fmodule-map-file=${PROJECT_SOURCE_DIR}/private/generic/module.modulemap>) + add_compile_options($<$:-fmodule-map-file=${PROJECT_SOURCE_DIR}/dispatch/generic/module.modulemap> + $<$:-fmodule-map-file=${PROJECT_SOURCE_DIR}/private/generic/module.modulemap>) endif() configure_file("${PROJECT_SOURCE_DIR}/cmake/config.h.in" "${PROJECT_BINARY_DIR}/config/config_ac.h") -add_compile_definitions($<$,$>:HAVE_CONFIG_H>) +add_compile_definitions($<$:HAVE_CONFIG_H>) if(ENABLE_SWIFT) diff --git a/cmake/modules/DispatchCompilerWarnings.cmake b/cmake/modules/DispatchCompilerWarnings.cmake index cd71f36e5..3fd1b3ddf 100644 --- a/cmake/modules/DispatchCompilerWarnings.cmake +++ b/cmake/modules/DispatchCompilerWarnings.cmake @@ -4,81 +4,81 @@ if("${CMAKE_C_SIMULATE_ID}" STREQUAL "MSVC") elseif(WIN32) # Tareting Windows but using a non-MSVC compiler. Set -fms-extensions # so that we can use __popcnt64 - add_compile_options($<$,$>:-fms-extensions>) + add_compile_options($<$:-fms-extensions>) else() - add_compile_options($<$,$>:-Werror>) - add_compile_options($<$,$>:-Wall>) - add_compile_options($<$,$>:-Wextra>) + add_compile_options($<$:-Werror>) + add_compile_options($<$:-Wall>) + add_compile_options($<$:-Wextra>) - add_compile_options($<$,$>:-Warray-bounds-pointer-arithmetic>) - add_compile_options($<$,$>:-Wassign-enum>) - add_compile_options($<$,$>:-Watomic-properties>) - add_compile_options($<$,$>:-Wcomma>) - add_compile_options($<$,$>:-Wconditional-uninitialized>) - add_compile_options($<$,$>:-Wconversion>) - add_compile_options($<$,$>:-Wcovered-switch-default>) - add_compile_options($<$,$>:-Wdate-time>) - add_compile_options($<$,$>:-Wdeprecated>) - add_compile_options($<$,$>:-Wdocumentation>) - add_compile_options($<$,$>:-Wdouble-promotion>) - add_compile_options($<$,$>:-Wduplicate-enum>) - add_compile_options($<$,$>:-Wexpansion-to-defined>) - add_compile_options($<$,$>:-Wfloat-equal>) - add_compile_options($<$,$>:-Widiomatic-parentheses>) - add_compile_options($<$,$>:-Winfinite-recursion>) - add_compile_options($<$,$>:-Wmissing-prototypes>) - add_compile_options($<$,$>:-Wnewline-eof>) - add_compile_options($<$,$>:-Wnullable-to-nonnull-conversion>) - add_compile_options($<$,$>:-Wobjc-interface-ivars>) - add_compile_options($<$,$>:-Wover-aligned>) - add_compile_options($<$,$>:-Wpacked>) - add_compile_options($<$,$>:-Wpointer-arith>) - add_compile_options($<$,$>:-Wselector>) - add_compile_options($<$,$>:-Wshadow>) - add_compile_options($<$,$>:-Wshorten-64-to-32>) - add_compile_options($<$,$>:-Wsign-conversion>) - add_compile_options($<$,$>:-Wstatic-in-inline>) - add_compile_options($<$,$>:-Wsuper-class-method-mismatch>) - add_compile_options($<$,$>:-Wswitch>) - add_compile_options($<$,$>:-Wunguarded-availability>) - add_compile_options($<$,$>:-Wunreachable-code>) - add_compile_options($<$,$>:-Wunused>) + add_compile_options($<$:-Warray-bounds-pointer-arithmetic>) + add_compile_options($<$:-Wassign-enum>) + add_compile_options($<$:-Watomic-properties>) + add_compile_options($<$:-Wcomma>) + add_compile_options($<$:-Wconditional-uninitialized>) + add_compile_options($<$:-Wconversion>) + add_compile_options($<$:-Wcovered-switch-default>) + add_compile_options($<$:-Wdate-time>) + add_compile_options($<$:-Wdeprecated>) + add_compile_options($<$:-Wdocumentation>) + add_compile_options($<$:-Wdouble-promotion>) + add_compile_options($<$:-Wduplicate-enum>) + add_compile_options($<$:-Wexpansion-to-defined>) + add_compile_options($<$:-Wfloat-equal>) + add_compile_options($<$:-Widiomatic-parentheses>) + add_compile_options($<$:-Winfinite-recursion>) + add_compile_options($<$:-Wmissing-prototypes>) + add_compile_options($<$:-Wnewline-eof>) + add_compile_options($<$:-Wnullable-to-nonnull-conversion>) + add_compile_options($<$:-Wobjc-interface-ivars>) + add_compile_options($<$:-Wover-aligned>) + add_compile_options($<$:-Wpacked>) + add_compile_options($<$:-Wpointer-arith>) + add_compile_options($<$:-Wselector>) + add_compile_options($<$:-Wshadow>) + add_compile_options($<$:-Wshorten-64-to-32>) + add_compile_options($<$:-Wsign-conversion>) + add_compile_options($<$:-Wstatic-in-inline>) + add_compile_options($<$:-Wsuper-class-method-mismatch>) + add_compile_options($<$:-Wswitch>) + add_compile_options($<$:-Wunguarded-availability>) + add_compile_options($<$:-Wunreachable-code>) + add_compile_options($<$:-Wunused>) - add_compile_options($<$,$>:-Wno-unknown-warning-option>) - add_compile_options($<$,$>:-Wno-trigraphs>) - add_compile_options($<$,$>:-Wno-four-char-constants>) - add_compile_options($<$,$>:-Wno-disabled-macro-expansion>) - add_compile_options($<$,$>:-Wno-pedantic>) - add_compile_options($<$,$>:-Wno-bad-function-cast>) - add_compile_options($<$,$>:-Wno-c++-compat>) - add_compile_options($<$,$>:-Wno-c++98-compat>) - add_compile_options($<$,$>:-Wno-c++98-compat-pedantic>) - add_compile_options($<$,$>:-Wno-cast-align>) - add_compile_options($<$,$>:-Wno-cast-qual>) - add_compile_options($<$,$>:-Wno-documentation-unknown-command>) - add_compile_options($<$,$>:-Wno-format-nonliteral>) - add_compile_options($<$,$>:-Wno-missing-variable-declarations>) - add_compile_options($<$,$>:-Wno-old-style-cast>) - add_compile_options($<$,$>:-Wno-padded>) - add_compile_options($<$,$>:-Wno-reserved-id-macro>) - add_compile_options($<$,$>:-Wno-shift-sign-overflow>) - add_compile_options($<$,$>:-Wno-undef>) - add_compile_options($<$,$>:-Wno-unreachable-code-aggressive>) - add_compile_options($<$,$>:-Wno-unused-macros>) - add_compile_options($<$,$>:-Wno-used-but-marked-unused>) - add_compile_options($<$,$>:-Wno-void-pointer-to-int-cast>) - add_compile_options($<$,$>:-Wno-vla>) + add_compile_options($<$:-Wno-unknown-warning-option>) + add_compile_options($<$:-Wno-trigraphs>) + add_compile_options($<$:-Wno-four-char-constants>) + add_compile_options($<$:-Wno-disabled-macro-expansion>) + add_compile_options($<$:-Wno-pedantic>) + add_compile_options($<$:-Wno-bad-function-cast>) + add_compile_options($<$:-Wno-c++-compat>) + add_compile_options($<$:-Wno-c++98-compat>) + add_compile_options($<$:-Wno-c++98-compat-pedantic>) + add_compile_options($<$:-Wno-cast-align>) + add_compile_options($<$:-Wno-cast-qual>) + add_compile_options($<$:-Wno-documentation-unknown-command>) + add_compile_options($<$:-Wno-format-nonliteral>) + add_compile_options($<$:-Wno-missing-variable-declarations>) + add_compile_options($<$:-Wno-old-style-cast>) + add_compile_options($<$:-Wno-padded>) + add_compile_options($<$:-Wno-reserved-id-macro>) + add_compile_options($<$:-Wno-shift-sign-overflow>) + add_compile_options($<$:-Wno-undef>) + add_compile_options($<$:-Wno-unreachable-code-aggressive>) + add_compile_options($<$:-Wno-unused-macros>) + add_compile_options($<$:-Wno-used-but-marked-unused>) + add_compile_options($<$:-Wno-void-pointer-to-int-cast>) + add_compile_options($<$:-Wno-vla>) if(CMAKE_SYSTEM_NAME STREQUAL Android) - add_compile_options($<$,$>:-Wno-incompatible-function-pointer-types>) - add_compile_options($<$,$>:-Wno-implicit-function-declaration>) - add_compile_options($<$,$>:-Wno-conversion>) - add_compile_options($<$,$>:-Wno-int-conversion>) - add_compile_options($<$,$>:-Wno-shorten-64-to-32>) + add_compile_options($<$:-Wno-incompatible-function-pointer-types>) + add_compile_options($<$:-Wno-implicit-function-declaration>) + add_compile_options($<$:-Wno-conversion>) + add_compile_options($<$:-Wno-int-conversion>) + add_compile_options($<$:-Wno-shorten-64-to-32>) endif() - add_compile_options($<$,$>:-Wno-error=assign-enum>) + add_compile_options($<$:-Wno-error=assign-enum>) # Should re-enable after rdar://133498289 is fixed (ie. fixing the one mismatched cast in apply.c) - add_compile_options($<$,$>:-Wno-cast-function-type-mismatch>) - add_compile_options($<$,$>:-Wno-error=unknown-warning-option>) + add_compile_options($<$:-Wno-cast-function-type-mismatch>) + add_compile_options($<$:-Wno-error=unknown-warning-option>) endif()