xaymar/cmake-clang
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix and improve various things

Browse Source 
- Fixed malformed regular expression for filtering files.
- Fixed incorrect C++/C standard detection.
- Add FOLDER and PROJECT_LABEL support.
- Fix order of flags, includes and defines causing issues.
- Fix multiple spaces causing flags to be treated as files.
- Upgrade to string(JSON) in many places.
- Make GLOBAL the default and remove the option.
This commit is contained in:
Michael Fabian 'Xaymar' Dirks
2023-04-22 23:47:24 +02:00
parent f249747ff0
commit 7e577af2e9
1 changed files with 225 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Clang.cmake
+212 -224
View File
@@ -43,8 +43,8 @@ function(get_target_include_directories)
foreach(_tmp ${gtid}) foreach(_tmp ${gtid})
list(APPEND ignore "${_tmp}") list(APPEND ignore "${_tmp}")
if((NOT "${_tmp}" IN_LIST _ARGS_IGNORE) AND (NOT "${_tmp}" STREQUAL "${_ARGS_TARGET}") AND (TARGET "${_tmp}")) if((NOT "${_tmp}" IN_LIST _ARGS_IGNORE) AND (NOT "${_tmp}" STREQUAL "${_ARGS_TARGET}") AND (TARGET "${_tmp}"))
get_target_include_directories(INTERFACE OUTPUT _tmp2 TARGET "${_tmp}" IGNORE ${ignore}) get_target_include_directories(INTERFACE OUTPUT cc_src_command TARGET "${_tmp}" IGNORE ${ignore})
foreach(_tmp3 ${_tmp2}) foreach(_tmp3 ${cc_src_command})
list(APPEND out "${_tmp3}") list(APPEND out "${_tmp3}")
endforeach() endforeach()
endif() endif()
@@ -102,8 +102,8 @@ function(get_target_definitions)
foreach(_tmp ${gtd}) foreach(_tmp ${gtd})
list(APPEND ignore "${_tmp}") list(APPEND ignore "${_tmp}")
if((NOT "${_tmp}" IN_LIST _ARGS_IGNORE) AND (NOT "${_tmp}" STREQUAL "${_ARGS_TARGET}") AND (TARGET "${_tmp}")) if((NOT "${_tmp}" IN_LIST _ARGS_IGNORE) AND (NOT "${_tmp}" STREQUAL "${_ARGS_TARGET}") AND (TARGET "${_tmp}"))
get_target_definitions(INTERFACE OUTPUT _tmp2 TARGET "${_tmp}" IGNORE ${ignore}) get_target_definitions(INTERFACE OUTPUT cc_src_command TARGET "${_tmp}" IGNORE ${ignore})
foreach(_tmp3 ${_tmp2}) foreach(_tmp3 ${cc_src_command})
list(APPEND out "${_tmp3}") list(APPEND out "${_tmp3}")
endforeach() endforeach()
endif() endif()
@@ -122,6 +122,58 @@ function(get_target_definitions)
set(${_ARGS_OUTPUT} "${out}" PARENT_SCOPE) set(${_ARGS_OUTPUT} "${out}" PARENT_SCOPE)
endfunction() endfunction()
macro(cstd_to_flag output version default)
set(${output} "${default}")
if(MSVC)
if("${version}" GREATER_EQUAL 17)
set(${output} "/std:c17")
elseif("${version}" GREATER_EQUAL 11)
set(${output} "/std:c11")
endif()
else()
if("${version}" GREATER_EQUAL 23)
set(${output} "-std=c2x")
elseif("${version}" GREATER_EQUAL 17)
set(${output} "-std=c17")
elseif("${version}" GREATER_EQUAL 11)
set(${output} "-std=c11")
elseif("${version}" GREATER_EQUAL 99)
set(${output} "-std=c99")
elseif("${version}" GREATER_EQUAL 90)
set(${output} "-std=c90")
endif()
endif()
endmacro()
macro(cxxstd_to_flag output version default)
set(${output} "${default}")
if(MSVC)
if("${version}" GREATER_EQUAL 23)
set(${output} "/std:c++latest")
elseif("${version}" GREATER_EQUAL 20)
set(${output} "/std:c++20")
elseif("${version}" GREATER_EQUAL 17)
set(${output} "/std:c++17")
elseif("${version}" GREATER_EQUAL 14)
set(${output} "/std:c++14")
endif()
else()
if("${version}" GREATER_EQUAL 23)
set(${output} "-std=c++23")
elseif("${version}" GREATER_EQUAL 20)
set(${output} "-std=c++20")
elseif("${version}" GREATER_EQUAL 17)
set(${output} "-std=c++17")
elseif("${version}" GREATER_EQUAL 14)
set(${output} "-std=c++14")
elseif("${version}" GREATER_EQUAL 11)
set(${output} "-std=c++11")
elseif("${version}" GREATER_EQUAL 98)
set(${output} "-std=c++98")
endif()
endif()
endmacro()
function(generate_compile_commands_json) function(generate_compile_commands_json)
cmake_parse_arguments( cmake_parse_arguments(
PARSE_ARGV 0 PARSE_ARGV 0
@@ -131,7 +183,7 @@ function(generate_compile_commands_json)
"TARGETS" "TARGETS"
) )
if(NOT _ARGS_REGEX) if(NOT _ARGS_REGEX)
set(_ARGS_REGEX "\.(h|hpp|c|cpp)$") set(_ARGS_REGEX "\\.(h|c)(|pp)$")
endif() endif()
# If the generator itself can create the compile_commands.json file, don't create our own. # If the generator itself can create the compile_commands.json file, don't create our own.
@@ -155,6 +207,14 @@ function(generate_compile_commands_json)
return() return()
endif() endif()
if(MSVC)
set(_define_prefix "/D")
set(_include_prefix "/I")
else()
set(_define_prefix "-D")
set(_include_prefix "-I")
endif()
# Is this generator able to have multiple configurations? # Is this generator able to have multiple configurations?
get_property(cc_multiconfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) get_property(cc_multiconfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
if(NOT cc_multiconfig) if(NOT cc_multiconfig)
@@ -163,7 +223,6 @@ function(generate_compile_commands_json)
set(cc_configurations ${CMAKE_CONFIGURATION_TYPES}) set(cc_configurations ${CMAKE_CONFIGURATION_TYPES})
endif() endif()
foreach(current_target ${_ARGS_TARGETS}) foreach(current_target ${_ARGS_TARGETS})
# For each target, generate a compile_commands.json file with all files. # For each target, generate a compile_commands.json file with all files.
@@ -175,67 +234,17 @@ function(generate_compile_commands_json)
# C++ Standard # C++ Standard
get_property(cc_tgt_std_CXX TARGET ${current_target} PROPERTY CXX_STANDARD) get_property(cc_tgt_std_CXX TARGET ${current_target} PROPERTY CXX_STANDARD)
if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") cxxstd_to_flag(cc_tgt_std_CXX "${cc_tgt_std_CXX}" "")
if(cc_tgt_std_CXX EQUAL 23)
set(cc_tgt_std_CXX "/std:c++latest")
elseif(cc_tgt_std_CXX EQUAL 20)
set(cc_tgt_std_CXX "/std:c++20")
elseif(cc_tgt_std_CXX EQUAL 17)
set(cc_tgt_std_CXX "/std:c++17")
elseif(cc_tgt_std_CXX EQUAL 14)
set(cc_tgt_std_CXX "/std:c++14")
else()
set(cc_tgt_std_CXX "")
endif()
else()
if(cc_tgt_std_CXX EQUAL 23)
set(cc_tgt_std_CXX "-std=c++23")
elseif(cc_tgt_std_CXX EQUAL 20)
set(cc_tgt_std_CXX "-std=c++20")
elseif(cc_tgt_std_CXX EQUAL 17)
set(cc_tgt_std_CXX "-std=c++17")
elseif(cc_tgt_std_CXX EQUAL 14)
set(cc_tgt_std_CXX "-std=c++14")
elseif(cc_tgt_std_CXX EQUAL 11)
set(cc_tgt_std_CXX "-std=c++11")
elseif(cc_tgt_std_CXX EQUAL 98)
set(cc_tgt_std_CXX "-std=c++98")
else()
set(cc_tgt_std_CXX "")
endif()
endif()
# C standard # C standard
get_property(cc_tgt_std_C TARGET ${current_target} PROPERTY C_STANDARD) get_property(cc_tgt_std_C TARGET ${current_target} PROPERTY C_STANDARD)
if(CMAKE_C_COMPILER_ID STREQUAL "MSVC") cstd_to_flag(cc_tgt_std_C "${cc_tgt_std_C}" "")
if(cc_tgt_std_C EQUAL 17)
set(cc_tgt_std_C "/std:c17")
elseif(cc_tgt_std_C EQUAL 11)
set(cc_tgt_std_C "/std:c11")
else()
set(cc_tgt_std_C "")
endif()
else()
if(cc_tgt_std_C EQUAL 23)
set(cc_tgt_std_C "-std=c2x")
elseif(cc_tgt_std_C EQUAL 17)
set(cc_tgt_std_C "-std=c17")
elseif(cc_tgt_std_C EQUAL 11)
set(cc_tgt_std_C "-std=c11")
elseif(cc_tgt_std_C EQUAL 99)
set(cc_tgt_std_C "-std=c99")
elseif(cc_tgt_std_C EQUAL 90)
set(cc_tgt_std_C "-std=c90")
else()
set(cc_tgt_std_C "")
endif()
endif()
# Include Directories # Include Directories
get_property(_tmp TARGET ${current_target} PROPERTY INCLUDE_DIRECTORIES) get_property(_tmp TARGET ${current_target} PROPERTY INCLUDE_DIRECTORIES)
foreach(_tmp2 ${_tmp}) foreach(cc_src_command ${_tmp})
cmake_path(ABSOLUTE_PATH _tmp2 BASE_DIRECTORY "${cc_tgt_source_dir}") cmake_path(ABSOLUTE_PATH cc_src_command BASE_DIRECTORY "${cc_tgt_source_dir}")
list(APPEND cc_tgt_includes "${_tmp2}") list(APPEND cc_tgt_includes "${cc_src_command}")
endforeach() endforeach()
get_target_include_directories(OUTPUT _tmp TARGET ${current_target}) get_target_include_directories(OUTPUT _tmp TARGET ${current_target})
@@ -249,34 +258,34 @@ function(generate_compile_commands_json)
if(TARGET ${_tmp3}) if(TARGET ${_tmp3})
# - Interface Include Directories # - Interface Include Directories
get_property(_tmp TARGET ${_tmp3} PROPERTY INTERFACE_INCLUDE_DIRECTORIES) get_property(_tmp TARGET ${_tmp3} PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
foreach(_tmp2 ${_tmp}) foreach(cc_src_command ${_tmp})
cmake_path(ABSOLUTE_PATH _tmp2 BASE_DIRECTORY "${cc_tgt_source_dir}") cmake_path(ABSOLUTE_PATH cc_src_command BASE_DIRECTORY "${cc_tgt_source_dir}")
list(APPEND cc_tgt_includes "${_tmp2}") list(APPEND cc_tgt_includes "${cc_src_command}")
endforeach() endforeach()
get_property(_tmp TARGET ${_tmp3} PROPERTY INTERFACE_SYSTEM_INCLUDE_DIRECTORIES) get_property(_tmp TARGET ${_tmp3} PROPERTY INTERFACE_SYSTEM_INCLUDE_DIRECTORIES)
foreach(_tmp2 ${_tmp}) foreach(cc_src_command ${_tmp})
cmake_path(ABSOLUTE_PATH _tmp2 BASE_DIRECTORY "${cc_tgt_source_dir}") cmake_path(ABSOLUTE_PATH cc_src_command BASE_DIRECTORY "${cc_tgt_source_dir}")
list(APPEND cc_tgt_includes "${_tmp2}") list(APPEND cc_tgt_includes "${cc_src_command}")
endforeach() endforeach()
# - Interface Defines, Options # - Interface Defines, Options
get_property(_tmp TARGET ${current_target} PROPERTY INTERFACE_COMPILE_DEFINITIONS) get_property(_tmp TARGET ${current_target} PROPERTY INTERFACE_COMPILE_DEFINITIONS)
foreach(_tmp2 ${_tmp}) foreach(cc_src_command ${_tmp})
list(APPEND cc_tgt_definitions "${_tmp2}") list(APPEND cc_tgt_definitions "${cc_src_command}")
endforeach() endforeach()
get_property(_tmp TARGET ${current_target} PROPERTY INTERFACE_COMPILE_OPTIONS) get_property(_tmp TARGET ${current_target} PROPERTY INTERFACE_COMPILE_OPTIONS)
foreach(_tmp2 ${_tmp}) foreach(cc_src_command ${_tmp})
list(APPEND cc_tgt_options "${_tmp2}") list(APPEND cc_tgt_options "${cc_src_command}")
endforeach() endforeach()
endif() endif()
endforeach() endforeach()
# Figure out source files for this target. # Figure out source files for this target.
set(cc_tgt_sources "") set(cc_tgt_sources "")
get_target_property(_tmp ${current_target} SOURCES) get_target_property(cc_tgt_sources_raw ${current_target} SOURCES)
foreach(_tmp2 ${_tmp}) foreach(cc_tgt_source ${cc_tgt_sources_raw})
cmake_path(ABSOLUTE_PATH _tmp2 BASE_DIRECTORY "${cc_tgt_source_dir}") cmake_path(ABSOLUTE_PATH cc_tgt_source BASE_DIRECTORY "${cc_tgt_source_dir}")
list(APPEND cc_tgt_sources "${_tmp2}") list(APPEND cc_tgt_sources "${cc_tgt_source}")
endforeach() endforeach()
list(FILTER cc_tgt_sources INCLUDE REGEX "${_ARGS_REGEX}") list(FILTER cc_tgt_sources INCLUDE REGEX "${_ARGS_REGEX}")
@@ -300,164 +309,125 @@ function(generate_compile_commands_json)
set(cc_src_language "C") set(cc_src_language "C")
endif() endif()
endif() endif()
if(CMAKE_${cc_src_language}_COMPILER_ID STREQUAL "MSVC")
set(_define_prefix "/D")
set(_include_prefix "/I")
else()
set(_define_prefix "-D")
set(_include_prefix "-I")
endif()
if(cc_src_language STREQUAL "CXX") if(cc_src_language STREQUAL "CXX")
# C++ Standard # C++ Standard
get_property(cc_src_std_CXX SOURCE ${current_source} TARGET_DIRECTORY ${current_target} PROPERTY CXX_STANDARD) get_property(cc_src_std_CXX SOURCE ${current_source} TARGET_DIRECTORY ${current_target} PROPERTY CXX_STANDARD)
if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") cxxstd_to_flag(cc_src_std "${cc_src_std_CXX}" "${cc_tgt_std_CXX}")
if(cc_src_std_CXX EQUAL 23)
set(cc_src_std "/std:c++latest")
elseif(cc_src_std_CXX EQUAL 20)
set(cc_src_std "/std:c++20")
elseif(cc_src_std_CXX EQUAL 17)
set(cc_src_std "/std:c++17")
elseif(cc_src_std_CXX EQUAL 14)
set(cc_src_std "/std:c++14")
else()
set(cc_src_std "${cc_tgt_std_CXX}")
endif()
else()
if(cc_src_std_CXX EQUAL 23)
set(cc_src_std "-std=c++23")
elseif(cc_src_std_CXX EQUAL 20)
set(cc_src_std "-std=c++20")
elseif(cc_src_std_CXX EQUAL 17)
set(cc_src_std "-std=c++17")
elseif(cc_src_std_CXX EQUAL 14)
set(cc_src_std "-std=c++14")
elseif(cc_src_std_CXX EQUAL 11)
set(cc_src_std "-std=c++11")
elseif(cc_src_std_CXX EQUAL 98)
set(cc_src_std "-std=c++98")
else()
set(cc_src_std "${cc_tgt_std_CXX}")
endif()
endif()
else() else()
# C standard # C standard
get_property(cc_src_std_C SOURCE ${current_source} TARGET_DIRECTORY ${current_target} PROPERTY C_STANDARD) get_property(cc_src_std_C SOURCE ${current_source} TARGET_DIRECTORY ${current_target} PROPERTY C_STANDARD)
if(CMAKE_C_COMPILER_ID STREQUAL "MSVC") cstd_to_flag(cc_src_std "${cc_src_std_C}" "${cc_tgt_std_C}")
if(cc_src_std_C EQUAL 17)
set(cc_src_std "/std:c17")
elseif(cc_src_std_C EQUAL 11)
set(cc_src_std "/std:c11")
else()
set(cc_src_std "${cc_tgt_std_C}")
endif()
else()
if(cc_src_std_C EQUAL 23)
set(cc_src_std "-std=c2x")
elseif(cc_src_std_C EQUAL 17)
set(cc_src_std "-std=c17")
elseif(cc_src_std_C EQUAL 11)
set(cc_src_std "-std=c11")
elseif(cc_src_std_C EQUAL 99)
set(cc_src_std "-std=c99")
elseif(cc_src_std_C EQUAL 90)
set(cc_src_std "-std=c90")
else()
set(cc_src_std "${cc_tgt_std_C}")
endif()
endif()
endif() endif()
# Compile Options
set(cc_src_options "${cc_tgt_options}")
get_property(_tmp SOURCE ${current_source} TARGET_DIRECTORY ${current_target} PROPERTY COMPILE_OPTIONS)
foreach(cc_src_command ${_tmp})
list(APPEND cc_src_options "${cc_src_command}")
endforeach()
# Includes # Includes
set(cc_src_includex "${cc_tgt_includes}") set(cc_src_includex "${cc_tgt_includes}")
get_property(_tmp SOURCE ${current_source} TARGET_DIRECTORY ${current_target} PROPERTY INCLUDE_DIRECTORIES) get_property(_tmp SOURCE ${current_source} TARGET_DIRECTORY ${current_target} PROPERTY INCLUDE_DIRECTORIES)
foreach(_tmp2 ${_tmp}) foreach(cc_src_command ${_tmp})
cmake_path(ABSOLUTE_PATH _tmp2 BASE_DIRECTORY "${cc_tgt_source_dir}") cmake_path(ABSOLUTE_PATH cc_src_command BASE_DIRECTORY "${cc_tgt_source_dir}")
list(APPEND cc_src_includex "${_tmp2}") list(APPEND cc_src_includex "${cc_src_command}")
endforeach() endforeach()
# Defines # Defines
set(cc_src_defines "${cc_tgt_defines}") set(cc_src_defines "${cc_tgt_defines}")
get_property(_tmp SOURCE ${current_source} TARGET_DIRECTORY ${current_target} PROPERTY COMPILE_DEFINITIONS) get_property(_tmp SOURCE ${current_source} TARGET_DIRECTORY ${current_target} PROPERTY COMPILE_DEFINITIONS)
foreach(_tmp2 ${_tmp}) foreach(cc_src_command ${_tmp})
list(APPEND cc_src_defines "${_tmp2}") list(APPEND cc_src_defines "${cc_src_command}")
endforeach()
# Compile Options
set(cc_src_options "${cc_tgt_options}")
get_property(_tmp SOURCE ${current_source} TARGET_DIRECTORY ${current_target} PROPERTY COMPILE_OPTIONS)
foreach(_tmp2 ${_tmp})
list(APPEND cc_src_options "${_tmp2}")
endforeach() endforeach()
#get_property(_ SOURCE ${current_source} TARGET_DIRECTORY ${current_target} PROPERTY _) #get_property(_ SOURCE ${current_source} TARGET_DIRECTORY ${current_target} PROPERTY _)
# Generate JSON content. # Generate JSON content.
string(APPEND cc_json_content "\t{\n") set(cc_json_content_entry "{}")
# Working Directory # Working Directory
json_escape_string(OUTPUT _tmp INPUT "${cc_tgt_source_dir}") file(TO_CMAKE_PATH "${cc_tgt_source_dir}" _tmp)
file(TO_CMAKE_PATH "${_tmp}" _tmp) json_escape_string(OUTPUT _tmp INPUT "${_tmp}")
string(APPEND cc_json_content "\t\t\"directory\": \"${_tmp}\",\n") string(JSON cc_json_content_entry SET ${cc_json_content_entry} "directory" \"${_tmp}\")
# Target File # Target File
json_escape_string(OUTPUT _tmp INPUT "${cc_src_location}") file(TO_CMAKE_PATH "${cc_src_location}" _tmp)
file(TO_CMAKE_PATH "${_tmp}" _tmp) json_escape_string(OUTPUT _tmp INPUT "${_tmp}")
string(APPEND cc_json_content "\t\t\"file\": \"${_tmp}\",\n") string(JSON cc_json_content_entry SET ${cc_json_content_entry} "file" \"${_tmp}\")
if(ON) # Command if(ON) # Command
set(_tmp2 "") set(cc_src_command "")
# cl/cc difference # cl/cc difference
if(CMAKE_${cc_src_language}_COMPILER_ID STREQUAL "MSVC") if(MSVC)
string(APPEND _tmp2 "cl ") list(APPEND cc_src_command "cl")
else() else()
string(APPEND _tmp2 "cc ") list(APPEND cc_src_command "cc")
endif() endif()
# C/CXX Standard # C/CXX Standard
string(APPEND _tmp2 "${cc_src_std} ") if(NOT "${cc_src_std}" STREQUAL "")
list(APPEND cc_src_command "${cc_src_std}")
endif()
# Global Flags # Global Flags
string(APPEND _tmp2 "${CMAKE_${cc_src_language}_FLAGS} ") if(MSVC)
separate_arguments(cc_src_flags WINDOWS_COMMAND ${CMAKE_${cc_src_language}_FLAGS})
else()
separate_arguments(cc_src_flags UNIX_COMMAND ${CMAKE_${cc_src_language}_FLAGS})
endif()
foreach(flag ${cc_src_flags})
if(NOT "${flag}" STREQUAL "")
list(APPEND cc_src_command "${flag}")
endif()
endforeach()
set(cc_src_command_config "")
foreach(current_config ${cc_configurations}) foreach(current_config ${cc_configurations})
string(TOUPPER "${current_config}" _tmp) string(TOUPPER "${current_config}" current_config_upper)
string(APPEND _tmp2 "$<$<CONFIG:${current_config}>:${CMAKE_${cc_src_language}_FLAGS_${_tmp}}> ") list(APPEND cc_src_command_config "$<$<CONFIG:${current_config}>:${CMAKE_${cc_src_language}_FLAGS_${current_config_upper}}>")
endforeach()
# Include Directories
foreach(_tmp ${cc_src_includex})
file(TO_CMAKE_PATH "${_tmp}" _tmp)
json_escape_string(OUTPUT _tmp INPUT "${_tmp}")
string(APPEND _tmp2 "\"${_include_prefix}${_tmp}\" ")
endforeach() endforeach()
list(JOIN cc_src_command_config "" cc_src_command_config)
list(APPEND cc_src_command "${cc_src_command_config}")
# Definitions # Definitions
foreach(_tmp ${cc_src_defines}) foreach(define ${cc_src_defines})
json_escape_string(OUTPUT _tmp INPUT "${_tmp}") if(NOT "${define}" STREQUAL "")
string(APPEND _tmp2 "\"${_define_prefix}${_tmp}\" ") list(APPEND cc_src_command "${_define_prefix}${define}")
endif()
endforeach() endforeach()
# Other Options # Other Options
foreach(_tmp ${cc_src_options}) foreach(option ${cc_src_options})
json_escape_string(OUTPUT _tmp INPUT "${_tmp}") if(NOT "${option}" STREQUAL "")
string(APPEND _tmp2 "\"${_tmp}\" ") list(APPEND cc_src_command "${option}")
endif()
endforeach()
# Include Directories
foreach(include ${cc_src_includex})
if(NOT "${include}" STREQUAL "")
file(TO_CMAKE_PATH "${include}" _tmp)
list(APPEND cc_src_command "${_include_prefix}${include}")
endif()
endforeach() endforeach()
# File to compile # File to compile
json_escape_string(OUTPUT _tmp INPUT "${cc_src_location}") json_escape_string(OUTPUT cc_src_location INPUT "${cc_src_location}")
if(CMAKE_${cc_src_language}_COMPILER_ID STREQUAL "MSVC") if(MSVC)
string(APPEND _tmp2 "\"${_tmp}\"") list(APPEND cc_src_command "\"${cc_src_location}\"")
else() else()
string(APPEND _tmp2 "-c \"${_tmp}\"") list(APPEND cc_src_command "-c \"${cc_src_location}\"")
endif() endif()
# Command # Build actual command entry.
json_escape_string(OUTPUT _tmp INPUT "${_tmp2}") list(JOIN cc_src_command " " cc_src_command)
string(APPEND cc_json_content "\t\t\"command\": \"${_tmp}\"\n") json_escape_string(OUTPUT _tmp INPUT "${cc_src_command}")
string(JSON cc_json_content_entry SET ${cc_json_content_entry} "command" \"${_tmp}\")
endif() endif()
string(APPEND cc_json_content "\t},\n") string(APPEND cc_json_content "${cc_json_content_entry},\n")
endforeach() endforeach()
# Close the array. # Close the array.
@@ -473,7 +443,7 @@ function(generate_compile_commands_json)
endforeach() endforeach()
unset(_tmp) unset(_tmp)
unset(_tmp2) unset(cc_src_command)
unset(current_target) unset(current_target)
unset(current_source) unset(current_source)
unset(current_config) unset(current_config)
@@ -484,7 +454,7 @@ function(clang_format)
cmake_parse_arguments( cmake_parse_arguments(
PARSE_ARGV 0 PARSE_ARGV 0
_ARGS _ARGS
"DEPENDENCY;GLOBAL" "DEPENDENCY"
"REGEX;VERSION" "REGEX;VERSION"
"TARGETS" "TARGETS"
) )
@@ -538,11 +508,13 @@ function(clang_format)
# Default Filter # Default Filter
if(NOT _ARGS_REGEX) if(NOT _ARGS_REGEX)
set(_ARGS_REGEX "\.(h|hpp|c|cpp)$") set(_ARGS_REGEX "\\.(h|hpp|c|cpp)$")
endif() endif()
# Go through each target # Go through each target
foreach(current_target ${_ARGS_TARGETS}) foreach(current_target ${_ARGS_TARGETS})
set(designed_target "${current_target}_clang-format")
get_target_property(target_sources_rel ${current_target} SOURCES) get_target_property(target_sources_rel ${current_target} SOURCES)
set(target_sources "") set(target_sources "")
foreach(_tmp ${target_sources_rel}) foreach(_tmp ${target_sources_rel})
@@ -557,27 +529,34 @@ function(clang_format)
get_filename_component(target_source_dir ${target_source_dir_rel} ABSOLUTE) get_filename_component(target_source_dir ${target_source_dir_rel} ABSOLUTE)
unset(target_source_dir_rel) unset(target_source_dir_rel)
add_custom_target(${current_target}_clang-format add_custom_target(${designed_target}
COMMAND "${CLANG_FORMAT_BIN}" -style=file -i ${target_sources} COMMAND "${CLANG_FORMAT_BIN}" -style=file -i ${target_sources}
COMMENT "clang-format: Formatting ${current_target}..." COMMENT "clang-format: Formatting ${current_target}..."
WORKING_DIRECTORY "${target_source_dir}" WORKING_DIRECTORY "${target_source_dir}"
) )
# IDE Folder # IDE Folder & Label
get_property(folder TARGET ${current_target} PROPERTY FOLDER) get_target_property(folder ${current_target} FOLDER)
set_target_properties(${current_target} PROPERTIES FOLDER "${folder}") get_target_property(label ${current_target} PROJECT_LABEL)
if(folder)
if(_ARGS_DEPENDENCY) set_target_properties(${designed_target} PROPERTIES FOLDER ${folder})
add_dependencies(${current_target} ${current_target}_clang-format) else()
set_target_properties(${designed_target} PROPERTIES FOLDER Clang)
endif()
if(label)
set_target_properties(${designed_target} PROPERTIES PROJECT_LABEL "${label} (clang-format)")
else()
set_target_properties(${designed_target} PROPERTIES PROJECT_LABEL "${current_target} (clang-format)")
endif() endif()
if(_ARGS_GLOBAL) if(_ARGS_DEPENDENCY)
if(TARGET clang-format) add_dependencies(${current_target} ${designed_target})
add_dependencies(clang-format ${current_target}_clang-format) endif()
else()
if(NOT TARGET clang-format)
add_custom_target(clang-format add_custom_target(clang-format
DEPENDS DEPENDS
${current_target}_clang-format ${designed_target}
COMMENT COMMENT
"clang-format: Formatting..." "clang-format: Formatting..."
) )
@@ -585,7 +564,7 @@ function(clang_format)
FOLDER Clang FOLDER Clang
) )
endif() endif()
endif() add_dependencies(clang-format ${designed_target})
endforeach() endforeach()
list(POP_BACK CMAKE_MESSAGE_INDENT) list(POP_BACK CMAKE_MESSAGE_INDENT)
endfunction() endfunction()
@@ -595,7 +574,7 @@ list(APPEND CMAKE_MESSAGE_INDENT "[clang-tidy] ")
cmake_parse_arguments( cmake_parse_arguments(
PARSE_ARGV 0 PARSE_ARGV 0
_ARGS _ARGS
"DEPENDENCY;GLOBAL" "DEPENDENCY"
"REGEX;VERSION" "REGEX;VERSION"
"TARGETS" "TARGETS"
) )
@@ -649,42 +628,44 @@ list(APPEND CMAKE_MESSAGE_INDENT "[clang-tidy] ")
# Default Filter # Default Filter
if(NOT _ARGS_REGEX) if(NOT _ARGS_REGEX)
set(_ARGS_REGEX "\.(h|hpp|c|cpp)$") set(_ARGS_REGEX "\\.(h|hpp|c|cpp)$")
endif() endif()
# Go through each target # Go through each target
foreach(current_target ${_ARGS_TARGETS}) foreach(current_target ${_ARGS_TARGETS})
set(designed_target "${current_target}_clang-tidy")
# Source Directory # Source Directory
get_target_property(_tmp2 ${current_target} SOURCE_DIR) get_target_property(cc_src_command ${current_target} SOURCE_DIR)
get_filename_component(target_source_dir ${_tmp2} ABSOLUTE) get_filename_component(target_source_dir ${cc_src_command} ABSOLUTE)
file(TO_CMAKE_PATH "${target_source_dir}" target_source_dir_nat) file(TO_CMAKE_PATH "${target_source_dir}" target_source_dir_nat)
unset(_tmp2) unset(cc_src_command)
# Binary Directory # Binary Directory
get_target_property(_tmp2 ${current_target} BINARY_DIR) get_target_property(cc_src_command ${current_target} BINARY_DIR)
get_filename_component(target_binary_dir ${_tmp2} ABSOLUTE) get_filename_component(target_binary_dir ${cc_src_command} ABSOLUTE)
file(TO_CMAKE_PATH "${target_binary_dir}" target_binary_dir_nat) file(TO_CMAKE_PATH "${target_binary_dir}" target_binary_dir_nat)
unset(_tmp2) unset(cc_src_command)
# Sources # Sources
get_target_property(_tmp2 ${current_target} SOURCES) get_target_property(cc_src_command ${current_target} SOURCES)
set(target_sources "") set(target_sources "")
foreach(_tmp ${_tmp2}) foreach(_tmp ${cc_src_command})
get_filename_component(_tmp ${_tmp} ABSOLUTE) get_filename_component(_tmp ${_tmp} ABSOLUTE)
file(TO_CMAKE_PATH "${_tmp}" _tmp) file(TO_CMAKE_PATH "${_tmp}" _tmp)
list(APPEND target_sources "${_tmp}") list(APPEND target_sources "${_tmp}")
endforeach() endforeach()
list(FILTER target_sources INCLUDE REGEX "${_ARGS_REGEX}") list(FILTER target_sources INCLUDE REGEX "${_ARGS_REGEX}")
unset(_tmp2) unset(cc_src_command)
add_custom_target(${current_target}_clang-tidy add_custom_target(${designed_target}
COMMENT "clang-tiy: Tidying ${current_target}..." COMMENT "clang-tidy: Tidying ${current_target}..."
WORKING_DIRECTORY "${target_binary_dir}" WORKING_DIRECTORY "${target_binary_dir}"
VERBATIM VERBATIM
) )
foreach(_tmp ${target_sources}) foreach(_tmp ${target_sources})
add_custom_command( add_custom_command(
TARGET ${current_target}_clang-tidy TARGET ${designed_target}
POST_BUILD POST_BUILD
COMMAND "${CLANG_TIDY_BIN}" COMMAND "${CLANG_TIDY_BIN}"
ARGS --quiet -p="$<TARGET_PROPERTY:${current_target},BINARY_DIR>/$<CONFIG>" "${_tmp}" ARGS --quiet -p="$<TARGET_PROPERTY:${current_target},BINARY_DIR>/$<CONFIG>" "${_tmp}"
@@ -693,21 +674,28 @@ list(APPEND CMAKE_MESSAGE_INDENT "[clang-tidy] ")
) )
endforeach() endforeach()
# IDE Folder # IDE Folder & Label
get_property(folder TARGET ${current_target} PROPERTY FOLDER) get_target_property(folder ${current_target} FOLDER)
set_target_properties(${current_target} PROPERTIES FOLDER "${folder}") get_target_property(label ${current_target} PROJECT_LABEL)
if(folder)
if(_ARGS_DEPENDENCY) set_target_properties(${designed_target} PROPERTIES FOLDER ${folder})
add_dependencies(${current_target} ${current_target}_clang-tidy) else()
set_target_properties(${designed_target} PROPERTIES FOLDER Clang)
endif()
if(label)
set_target_properties(${designed_target} PROPERTIES PROJECT_LABEL "${label} (clang-tidy)")
else()
set_target_properties(${designed_target} PROPERTIES PROJECT_LABEL "${current_target} (clang-tidy)")
endif() endif()
if(_ARGS_GLOBAL) if(_ARGS_DEPENDENCY)
if(TARGET clang-tidy) add_dependencies(${current_target} ${designed_target})
add_dependencies(clang-tidy ${current_target}_clang-format) endif()
else()
if(NOT TARGET clang-tidy)
add_custom_target(clang-tidy add_custom_target(clang-tidy
DEPENDS DEPENDS
${current_target}_clang-tidy ${designed_target}
COMMENT COMMENT
"clang-tiy: Tidying..." "clang-tiy: Tidying..."
) )
@@ -715,7 +703,7 @@ list(APPEND CMAKE_MESSAGE_INDENT "[clang-tidy] ")
FOLDER Clang FOLDER Clang
) )
endif() endif()
endif() add_dependencies(clang-tidy ${designed_target})
endforeach() endforeach()
list(POP_BACK CMAKE_MESSAGE_INDENT) list(POP_BACK CMAKE_MESSAGE_INDENT)
endfunction() endfunction()