diff --git a/CMakeLists.txt b/CMakeLists.txt index 6c9c783fec6..4b59c67e319 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2542,11 +2542,10 @@ set(CMAKE_CXX_EXTENSIONS OFF) # Visual Studio has all standards it supports available by default # Clang on windows copies this behavior and does not support these switches -if( - CMAKE_COMPILER_IS_GNUCC OR - (CMAKE_C_COMPILER_ID MATCHES "Clang" AND (NOT MSVC)) OR - (CMAKE_C_COMPILER_ID STREQUAL "Intel") -) +if(CMAKE_COMPILER_IS_GNUCC OR + (CMAKE_C_COMPILER_ID MATCHES "Clang" AND (NOT MSVC)) OR + (CMAKE_C_COMPILER_ID STREQUAL "Intel")) + # Use C11 + GNU extensions, works with GCC, Clang, ICC string(APPEND CMAKE_C_FLAGS " -std=gnu11") endif() diff --git a/build_files/build_environment/cmake/x265.cmake b/build_files/build_environment/cmake/x265.cmake index 22cfdad5d44..01a9110a00b 100644 --- a/build_files/build_environment/cmake/x265.cmake +++ b/build_files/build_environment/cmake/x265.cmake @@ -155,8 +155,8 @@ set(ARG_AR_INPUT $\{CMAKE_ARGV$\{INDEX_AR_INPUT\}\}) execute_process( COMMAND $\{ARG_AR\} -M INPUT_FILE $\{ARG_AR_INPUT\} -) -") +)" + ) ExternalProject_Add_Step(external_x265 after_install COMMAND ${CMAKE_COMMAND} -P ${_ar_cmake} -- ${CMAKE_AR} ${_ar_stdin} diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake index 36493e335b0..a73937c3001 100644 --- a/build_files/cmake/platform/platform_win32.cmake +++ b/build_files/cmake/platform/platform_win32.cmake @@ -62,15 +62,13 @@ if(WITH_BLENDER AND NOT WITH_PYTHON_MODULE) set_property(DIRECTORY PROPERTY VS_STARTUP_PROJECT blender) endif() -macro(warn_hardcoded_paths package_name - ) +macro(warn_hardcoded_paths package_name) if(WITH_WINDOWS_FIND_MODULES) message(WARNING "Using HARDCODED ${package_name} locations") endif() endmacro() -macro(windows_find_package package_name - ) +macro(windows_find_package package_name) if(WITH_WINDOWS_FIND_MODULES) find_package(${package_name}) endif() diff --git a/source/blender/editors/datafiles/CMakeLists.txt b/source/blender/editors/datafiles/CMakeLists.txt index e649aa8e462..5d7a42a7e40 100644 --- a/source/blender/editors/datafiles/CMakeLists.txt +++ b/source/blender/editors/datafiles/CMakeLists.txt @@ -458,7 +458,7 @@ if(WITH_BLENDER) keyframe keyframe_hlt keyingset - key_backspace + key_backspace key_backspace_filled key_command key_command_filled