Skip to content

Commit 825cb57

Browse files
AlexDenisovAlexDenisov
committed
Reformat cmake
1 parent d963e41 commit 825cb57

File tree

45 files changed

+635
-601
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+635
-601
lines changed

Diff for: ‎CMakeLists.txt

+15-18
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@ if(NOT MULL_VERSION)
44
set(MULL_VERSION 0.23.0)
55
endif()
66

7-
project(Mull
8-
LANGUAGES C CXX
9-
)
7+
project(Mull LANGUAGES C CXX)
108

119
if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
1210
include(CTest)
@@ -18,9 +16,11 @@ set(CMAKE_CXX_EXTENSIONS OFF)
1816

1917
# -DRECORD_TIMING=ON
2018
if(RECORD_TIMING)
21-
set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "\"${CMAKE_COMMAND}\" -E time")
19+
set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE
20+
"\"${CMAKE_COMMAND}\" -E time")
2221
set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK "\"${CMAKE_COMMAND}\" -E time")
23-
set_property(GLOBAL PROPERTY RULE_LAUNCH_CUSTOM "\"${CMAKE_COMMAND}\" -E time")
22+
set_property(GLOBAL PROPERTY RULE_LAUNCH_CUSTOM
23+
"\"${CMAKE_COMMAND}\" -E time")
2424
endif()
2525

2626
set(PROJECT_VERSION ${MULL_VERSION})
@@ -57,7 +57,9 @@ set(LIT_LLVM_PROFDATA ${clang_binary_dir}/bin/llvm-profdata)
5757

5858
set(MULL_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
5959

60-
set(MULL_CXX_FLAGS "-fPIC -fvisibility-inlines-hidden -fno-exceptions -Wunused -Wall -fvisibility=hidden")
60+
set(MULL_CXX_FLAGS
61+
"-fPIC -fvisibility-inlines-hidden -fno-exceptions -Wunused -Wall -fvisibility=hidden"
62+
)
6163

6264
if(NOT LLVM_ENABLE_RTTI)
6365
set(MULL_CXX_FLAGS "${MULL_CXX_FLAGS} -fno-rtti")
@@ -67,14 +69,9 @@ add_subdirectory(vendor)
6769

6870
set(MULL_DEFINITIONS ${LLVM_DEFINITIONS})
6971
set(THIRD_PARTY_INCLUDE_DIRS
70-
${LLVM_INCLUDE_DIRS}
71-
${CLANG_INCLUDE_DIRS}
72-
${CMAKE_CURRENT_LIST_DIR}/vendor/libirm/include
73-
${CMAKE_SOURCE_DIR}/vendor
74-
)
75-
set(MULL_INCLUDE_DIRS
76-
${MULL_SOURCE_DIR}/include
77-
)
72+
${LLVM_INCLUDE_DIRS} ${CLANG_INCLUDE_DIRS}
73+
${CMAKE_CURRENT_LIST_DIR}/vendor/libirm/include ${CMAKE_SOURCE_DIR}/vendor)
74+
set(MULL_INCLUDE_DIRS ${MULL_SOURCE_DIR}/include)
7875

7976
include(${CMAKE_CURRENT_LIST_DIR}/cmake/cpack.cmake)
8077
include(${CMAKE_CURRENT_LIST_DIR}/cmake/version.cmake)
@@ -83,10 +80,10 @@ include(${CMAKE_CURRENT_LIST_DIR}/cmake/version.cmake)
8380
link_directories(/usr/local/lib)
8481

8582
# https://cmake.org/Wiki/CMake_RPATH_handling#Always_full_RPATH
86-
SET(CMAKE_SKIP_BUILD_RPATH FALSE)
87-
SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
88-
SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib" "${LLVM_LIB_PATH}")
89-
SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
83+
set(CMAKE_SKIP_BUILD_RPATH FALSE)
84+
set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
85+
set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib" "${LLVM_LIB_PATH}")
86+
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
9087

9188
add_subdirectory(lib)
9289
add_subdirectory(tools)

Diff for: ‎cmake/cpack.cmake

+35-33
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,35 @@
1-
set (CPACK_PACKAGE_NAME ${CMAKE_PROJECT_NAME}-${LLVM_VERSION_MAJOR})
2-
set (CPACK_PACKAGE_VENDOR mull-project)
3-
set (CPACK_PACKAGE_DESCRIPTION ${PROJECT_DESCRIPTION})
4-
set (CPACK_PACKAGE_DESCRIPTION_SUMMARY ${PROJECT_DESCRIPTION})
5-
set (CPACK_PACKAGE_CONTACT "Alex Denisov <[email protected]>")
6-
set (CPACK_PACKAGE_HOMEPAGE_URL ${PROJECT_HOMEPAGE_URL})
7-
8-
set (CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
9-
set (CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR})
10-
set (CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH})
11-
set (CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
12-
13-
set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_BINARY_DIR}/LICENSE.txt")
1+
set(CPACK_PACKAGE_NAME ${CMAKE_PROJECT_NAME}-${LLVM_VERSION_MAJOR})
2+
set(CPACK_PACKAGE_VENDOR mull-project)
3+
set(CPACK_PACKAGE_DESCRIPTION ${PROJECT_DESCRIPTION})
4+
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY ${PROJECT_DESCRIPTION})
5+
set(CPACK_PACKAGE_CONTACT "Alex Denisov <[email protected]>")
6+
set(CPACK_PACKAGE_HOMEPAGE_URL ${PROJECT_HOMEPAGE_URL})
7+
8+
set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
9+
set(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR})
10+
set(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH})
11+
set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
12+
13+
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_BINARY_DIR}/LICENSE.txt")
1414
configure_file(${CMAKE_SOURCE_DIR}/LICENSE ${CPACK_RESOURCE_FILE_LICENSE})
1515

16-
set (CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/cmake/packaging/ReadMe.txt")
17-
set (CPACK_RESOURCE_FILE_WELCOME "${CMAKE_SOURCE_DIR}/cmake/packaging/Welcome.txt")
16+
set(CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/cmake/packaging/ReadMe.txt")
17+
set(CPACK_RESOURCE_FILE_WELCOME
18+
"${CMAKE_SOURCE_DIR}/cmake/packaging/Welcome.txt")
1819

19-
if (APPLE)
20-
set (CPACK_SYSTEM_NAME "macOS")
20+
if(APPLE)
21+
set(CPACK_SYSTEM_NAME "macOS")
2122
execute_process(
2223
COMMAND sw_vers -productVersion
2324
OUTPUT_VARIABLE CPACK_SYSTEM_VERSION
24-
OUTPUT_STRIP_TRAILING_WHITESPACE
25-
)
25+
OUTPUT_STRIP_TRAILING_WHITESPACE)
2626

2727
elseif(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
28-
set (CPACK_SYSTEM_NAME "FreeBSD")
28+
set(CPACK_SYSTEM_NAME "FreeBSD")
2929
execute_process(
3030
COMMAND freebsd-version
3131
OUTPUT_VARIABLE CPACK_SYSTEM_VERSION
32-
OUTPUT_STRIP_TRAILING_WHITESPACE
33-
)
32+
OUTPUT_STRIP_TRAILING_WHITESPACE)
3433

3534
else()
3635
if(EXISTS /etc/os-release)
@@ -39,25 +38,25 @@ else()
3938

4039
foreach(LINE ${LINES})
4140
string(REGEX MATCH "^ID=\"?([A-Za-z0-9._-]+)\"?" match ${LINE}})
42-
if (match)
43-
set (CPACK_SYSTEM_NAME ${CMAKE_MATCH_1})
41+
if(match)
42+
set(CPACK_SYSTEM_NAME ${CMAKE_MATCH_1})
4443
endif()
4544

4645
string(REGEX MATCH "^VERSION_ID=\"?([A-Za-z0-9._-]+)\"?" match ${LINE}})
47-
if (match)
48-
set (CPACK_SYSTEM_VERSION ${CMAKE_MATCH_1})
46+
if(match)
47+
set(CPACK_SYSTEM_VERSION ${CMAKE_MATCH_1})
4948
endif()
5049
endforeach()
5150

5251
else()
53-
set (CPACK_SYSTEM_NAME "unknown")
52+
set(CPACK_SYSTEM_NAME "unknown")
5453

5554
endif()
5655
endif()
5756

58-
if (${CPACK_SYSTEM_NAME} STREQUAL "macOS")
57+
if(${CPACK_SYSTEM_NAME} STREQUAL "macOS")
5958
include(cmake/packaging/cpack.ZIP-macOS.cmake)
60-
elseif (${CPACK_SYSTEM_NAME} STREQUAL "debian")
59+
elseif(${CPACK_SYSTEM_NAME} STREQUAL "debian")
6160
include(cmake/packaging/cpack.DEB-debian.cmake)
6261
elseif(${CPACK_SYSTEM_NAME} STREQUAL "ubuntu")
6362
include(cmake/packaging/cpack.DEB-ubuntu.cmake)
@@ -69,12 +68,15 @@ else()
6968
message(WARNING "Mull cannot generate package for ${CPACK_SYSTEM_NAME} yet.")
7069
endif()
7170

72-
set (MULL_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-LLVM-${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}-${CPACK_SYSTEM_NAME}-${CPACK_SYSTEM_VERSION}")
71+
set(MULL_PACKAGE_FILE_NAME
72+
"${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-LLVM-${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}-${CPACK_SYSTEM_NAME}-${CPACK_SYSTEM_VERSION}"
73+
)
7374

74-
set (CPACK_PACKAGE_FILE_NAME ${MULL_PACKAGE_FILE_NAME})
75+
set(CPACK_PACKAGE_FILE_NAME ${MULL_PACKAGE_FILE_NAME})
7576

76-
set (CPACK_STRIP_FILES TRUE)
77+
set(CPACK_STRIP_FILES TRUE)
7778

7879
include(CPack)
7980

80-
file (WRITE ${CMAKE_CURRENT_BINARY_DIR}/PACKAGE_FILE_NAME ${MULL_PACKAGE_FILE_NAME})
81+
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/PACKAGE_FILE_NAME
82+
${MULL_PACKAGE_FILE_NAME})

Diff for: ‎cmake/fixtures.cmake

+22-16
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ function(_fixture_prefix prefix path out)
99
string(REPLACE "${prefix}/tests/unit/fixtures/" "" replaced "${path}")
1010
file(TO_CMAKE_PATH "${replaced}" replaced)
1111
string(REPLACE "/" "_" replaced ${replaced})
12-
set(${out} ${replaced} PARENT_SCOPE)
12+
set(${out}
13+
${replaced}
14+
PARENT_SCOPE)
1315
endfunction()
1416

1517
function(compile_fixture)
@@ -18,24 +20,22 @@ function(compile_fixture)
1820
set(singleValueArguments INPUT OUTPUT_EXTENSION)
1921
set(multipleValueArguments FLAGS)
2022

21-
cmake_parse_arguments(${prefix}
22-
"${optionArguments}"
23-
"${singleValueArguments}"
24-
"${multipleValueArguments}"
25-
${ARGN}
26-
)
23+
cmake_parse_arguments(
24+
${prefix} "${optionArguments}" "${singleValueArguments}"
25+
"${multipleValueArguments}" ${ARGN})
2726

2827
get_filename_component(filename ${local_INPUT} NAME_WE)
2928
get_filename_component(full_path ${local_INPUT} DIRECTORY)
3029
_fixture_prefix(${CMAKE_SOURCE_DIR} ${full_path} path_prefix)
3130

3231
set(fixture ${CMAKE_CURRENT_BINARY_DIR}/${filename}.${local_OUTPUT_EXTENSION})
3332

34-
add_custom_command(OUTPUT ${fixture}
33+
add_custom_command(
34+
OUTPUT ${fixture}
3535
COMMAND ${MULL_CC} ${SYSROOT} ${local_FLAGS} ${local_INPUT} -o ${fixture}
36-
DEPENDS ${local_INPUT}
37-
)
38-
set(dependency build-${path_prefix}-${filename}-${local_OUTPUT_EXTENSION}-fixture)
36+
DEPENDS ${local_INPUT})
37+
set(dependency
38+
build-${path_prefix}-${filename}-${local_OUTPUT_EXTENSION}-fixture)
3939

4040
if(TARGET clang)
4141
set(clang_dependencies clang)
@@ -49,7 +49,8 @@ function(compile_fixture)
4949
set(clang_dependencies ${clang_dependencies} cxxabi)
5050
endif()
5151

52-
add_custom_target(${dependency} DEPENDS ${fixture} ${clang_dependencies} ${local_INPUT})
52+
add_custom_target(${dependency} DEPENDS ${fixture} ${clang_dependencies}
53+
${local_INPUT})
5354
add_fixture(${fixture})
5455
add_fixture_dependency(${dependency})
5556
endfunction()
@@ -58,7 +59,7 @@ function(generate_fixture_factory fixture_factory)
5859
get_property(fixtures GLOBAL PROPERTY TEST_FIXTURES)
5960

6061
set(HEADER
61-
"// !!! Autogenerated file !!!
62+
"// !!! Autogenerated file !!!
6263
6364
namespace mull {
6465
namespace fixtures {
@@ -84,18 +85,23 @@ namespace fixtures {
8485
message(FATAL_ERROR "Unexpected fixture path: ${full_path}")
8586
endif()
8687

87-
file(APPEND ${FIXTURE_FACTORY}
88+
file(
89+
APPEND ${FIXTURE_FACTORY}
8890
"
8991
__attribute__((used)) static const char *${path_prefix}_${filename}_${extension}_path() {
9092
return \"${fixture}\";
9193
}
9294
")
9395
endforeach()
9496

95-
file(APPEND ${FIXTURE_FACTORY} "
97+
file(
98+
APPEND ${FIXTURE_FACTORY}
99+
"
96100
} // namespace fixtures
97101
} // namespace mull
98102
")
99103

100-
set(${fixture_factory} ${FIXTURE_FACTORY} PARENT_SCOPE)
104+
set(${fixture_factory}
105+
${FIXTURE_FACTORY}
106+
PARENT_SCOPE)
101107
endfunction()

Diff for: ‎cmake/functions.cmake

+42-40
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,39 @@
11
macro(add_mull_executable)
2-
set (prefix local)
3-
set (optionArguments )
4-
set (singleValueArguments NAME)
5-
set (multipleValueArguments SOURCES LINK_WITH)
2+
set(prefix local)
3+
set(optionArguments)
4+
set(singleValueArguments NAME)
5+
set(multipleValueArguments SOURCES LINK_WITH)
66

7-
cmake_parse_arguments(${prefix}
8-
"${optionArguments}"
9-
"${singleValueArguments}"
10-
"${multipleValueArguments}"
11-
${ARGN}
12-
)
7+
cmake_parse_arguments(
8+
${prefix} "${optionArguments}" "${singleValueArguments}"
9+
"${multipleValueArguments}" ${ARGN})
1310

1411
add_executable(${local_NAME} ${local_SOURCES})
1512
target_link_libraries(${local_NAME} ${local_LINK_WITH} MullVersion)
1613

17-
set_target_properties(${local_NAME} PROPERTIES
18-
COMPILE_FLAGS ${MULL_CXX_FLAGS}
19-
)
20-
target_include_directories(${local_NAME} PUBLIC
21-
${MULL_INCLUDE_DIRS}
22-
)
23-
target_include_directories(${local_NAME} SYSTEM PRIVATE
24-
${THIRD_PARTY_INCLUDE_DIRS}
25-
)
14+
set_target_properties(${local_NAME} PROPERTIES COMPILE_FLAGS
15+
${MULL_CXX_FLAGS})
16+
target_include_directories(${local_NAME} PUBLIC ${MULL_INCLUDE_DIRS})
17+
target_include_directories(${local_NAME} SYSTEM
18+
PRIVATE ${THIRD_PARTY_INCLUDE_DIRS})
2619

27-
INSTALL(TARGETS ${local_NAME}
28-
RUNTIME DESTINATION bin
29-
)
20+
install(TARGETS ${local_NAME} RUNTIME DESTINATION bin)
3021
endmacro()
3122

3223
function(determine_clang_component_lib lib_out component)
33-
# Assume the component comes as a separate lib
34-
# until otherwise proven
35-
set(${lib_out} ${component} PARENT_SCOPE)
24+
# Assume the component comes as a separate lib until otherwise proven
25+
set(${lib_out}
26+
${component}
27+
PARENT_SCOPE)
3628

3729
# Check whether the LLVM shared library was built
38-
if("${LLVM_LINK_LLVM_DYLIB}" STREQUAL "ON" AND NOT "${LLVM_DYLIB_COMPONENTS}" STREQUAL "")
30+
if("${LLVM_LINK_LLVM_DYLIB}" STREQUAL "ON" AND NOT "${LLVM_DYLIB_COMPONENTS}"
31+
STREQUAL "")
3932
# The LLVM_DYLIB_COMPONENTS variable lists the components included in the
40-
# shared library. According to https://llvm.org/docs/BuildingADistribution.html,
41-
# it is a list of semi-colon separated names of LLVM components or special
42-
# purpose names. The latter are
33+
# shared library. According to
34+
# https://llvm.org/docs/BuildingADistribution.html, it is a list of
35+
# semi-colon separated names of LLVM components or special purpose names.
36+
# The latter are
4337
#
4438
# 1. all - All available LLVM component libraries included
4539
# 2. Native - The LLVM target for the native system
@@ -48,27 +42,35 @@ function(determine_clang_component_lib lib_out component)
4842
# 5. AllTargetsDisassemblers - All included target dissassembler libraries
4943
# 6. AllTargetsInfos - All included target info libraries
5044
#
51-
# I can't find any relevant reference to Native in the LLVM source tree
52-
# so we leave that out for now
45+
# I can't find any relevant reference to Native in the LLVM source tree so
46+
# we leave that out for now
5347
if("${LLVM_DYLIB_COMPONENTS}" STREQUAL "all")
5448
# Dylib includes all components, linking against it is a safe bet
55-
set(${lib_out} clang-cpp PARENT_SCOPE)
49+
set(${lib_out}
50+
clang-cpp
51+
PARENT_SCOPE)
5652
elseif(${component} IN_LIST LLVM_DYLIB_COMPONENTS)
5753
# Component listed in DYLIB_COMPONENTS, included
58-
set(${lib_out} clang-cpp PARENT_SCOPE)
54+
set(${lib_out}
55+
clang-cpp
56+
PARENT_SCOPE)
5957
else()
60-
# Look through remaining special purpose names. Based on llvm/cmake/modules/LLVM-Config.cmake
61-
# in the LLVM repo, the targets correspond to the following
58+
# Look through remaining special purpose names. Based on
59+
# llvm/cmake/modules/LLVM-Config.cmake in the LLVM repo, the targets
60+
# correspond to the following
6261
#
6362
# AllTargetsAsmParsers - All components ending in AsmParser
64-
# AllTargetsDescs - All components ending in Desc
65-
# AllTargetsDisassemblers - All components ending in Disassembler
66-
# AllTargetsInfos - All components ending in Info
63+
# AllTargetsDescs - All components ending in Desc AllTargetsDisassemblers
64+
# - All components ending in Disassembler AllTargetsInfos - All components
65+
# ending in Info
6766
set(suffixes AsmParser Desc Disassembler Info)
6867

6968
foreach(s ${suffixes})
70-
if(${component} MATCHES ".*${s}$" AND "${LLVM_DYLIB_COMPONENTS}" STREQUAL "AllTargets${s}s")
71-
set(${lib_out} clang-cpp PARENT_SCOPE)
69+
if(${component} MATCHES ".*${s}$" AND "${LLVM_DYLIB_COMPONENTS}"
70+
STREQUAL "AllTargets${s}s")
71+
set(${lib_out}
72+
clang-cpp
73+
PARENT_SCOPE)
7274
endif()
7375
endforeach()
7476
endif()

Diff for: ‎cmake/packaging/cpack.DEB-debian.cmake

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
set (CPACK_GENERATOR DEB)
2-
set (CPACK_DEBIAN_PACKAGE_MAINTAINER ${CPACK_PACKAGE_CONTACT})
3-
set (CPACK_DEBIAN_PACKAGE_DESCRIPTION ${PROJECT_DESCRIPTION})
1+
set(CPACK_GENERATOR DEB)
2+
set(CPACK_DEBIAN_PACKAGE_MAINTAINER ${CPACK_PACKAGE_CONTACT})
3+
set(CPACK_DEBIAN_PACKAGE_DESCRIPTION ${PROJECT_DESCRIPTION})
44

5-
set (CPACK_DEBIAN_PACKAGE_DEPENDS "libz-dev, libsqlite3-dev, ncurses-dev, libstdc++-6-dev, libxml2-dev, uuid-dev")
5+
set(CPACK_DEBIAN_PACKAGE_DEPENDS
6+
"libz-dev, libsqlite3-dev, ncurses-dev, libstdc++-6-dev, libxml2-dev, uuid-dev"
7+
)

0 commit comments

Comments
 (0)