Skip to content

Commit b30eb2e

Browse files
committed
Reformat all CMake scripts using cmake-format
1 parent b498a7e commit b30eb2e

File tree

14 files changed

+657
-649
lines changed

14 files changed

+657
-649
lines changed

CMakeLists.txt

Lines changed: 209 additions & 196 deletions
Large diffs are not rendered by default.

cmake-scripts/ClangFormat.cmake

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ function(prefix_clangformat_setup prefix)
1616
set(CLANGFORMAT_EXECUTABLE ${clangformat_executable_tmp})
1717
unset(clangformat_executable_tmp)
1818
else()
19-
message(FATAL_ERROR "ClangFormat: ${CLANGFORMAT_EXECUTABLE} not found! Aborting")
19+
message(
20+
FATAL_ERROR "ClangFormat: ${CLANGFORMAT_EXECUTABLE} not found! Aborting"
21+
)
2022
endif()
2123
endif()
2224

@@ -25,17 +27,11 @@ function(prefix_clangformat_setup prefix)
2527
list(APPEND clangformat_sources ${clangformat_source})
2628
endforeach()
2729

28-
add_custom_target(${prefix}_clangformat
29-
COMMAND
30-
${CLANGFORMAT_EXECUTABLE}
31-
-style=file
32-
-i
33-
${clangformat_sources}
34-
WORKING_DIRECTORY
35-
${CMAKE_SOURCE_DIR}
36-
COMMENT
37-
"Formatting ${prefix} with ${CLANGFORMAT_EXECUTABLE} ..."
38-
)
30+
add_custom_target(
31+
${prefix}_clangformat
32+
COMMAND ${CLANGFORMAT_EXECUTABLE} -style=file -i ${clangformat_sources}
33+
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
34+
COMMENT "Formatting ${prefix} with ${CLANGFORMAT_EXECUTABLE} ...")
3935

4036
if(TARGET clangformat)
4137
add_dependencies(clangformat ${prefix}_clangformat)

cmake-scripts/FindCUnit.cmake

Lines changed: 19 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,24 @@
1+
set(CUNIT_SEARCH_PATHS /usr/local/ /usr /opt)
12

2-
SET(CUNIT_SEARCH_PATHS
3-
/usr/local/
4-
/usr
5-
/opt
6-
)
3+
find_path(
4+
CUNIT_INCLUDE_DIR CUnit/CUnit.h
5+
HINTS
6+
PATH_SUFFIXES include
7+
PATHS ${CUNIT_SEARCH_PATHS})
8+
find_library(
9+
CUNIT_LIBRARY cunit
10+
HINTS
11+
PATH_SUFFIXES lib64 lib bin
12+
PATHS ${CUNIT_SEARCH_PATHS})
713

8-
FIND_PATH(CUNIT_INCLUDE_DIR CUnit/CUnit.h
9-
HINTS
10-
PATH_SUFFIXES include
11-
PATHS ${CUNIT_SEARCH_PATHS}
12-
)
13-
FIND_LIBRARY(CUNIT_LIBRARY cunit
14-
HINTS
15-
PATH_SUFFIXES lib64 lib bin
16-
PATHS ${CUNIT_SEARCH_PATHS}
17-
)
14+
if(CUNIT_INCLUDE_DIR AND CUNIT_LIBRARY)
15+
set(CUNIT_FOUND TRUE)
16+
endif(CUNIT_INCLUDE_DIR AND CUNIT_LIBRARY)
1817

19-
IF (CUNIT_INCLUDE_DIR AND CUNIT_LIBRARY)
20-
SET(CUNIT_FOUND TRUE)
21-
ENDIF (CUNIT_INCLUDE_DIR AND CUNIT_LIBRARY)
22-
23-
IF (CUNIT_FOUND)
24-
MESSAGE(STATUS "Found CUnit: ${CUNIT_LIBRARY}")
25-
ELSE (CUNIT_FOUND)
26-
MESSAGE(STATUS "Could not find CUnit. Tests will not be available.")
27-
ENDIF (CUNIT_FOUND)
18+
if(CUNIT_FOUND)
19+
message(STATUS "Found CUnit: ${CUNIT_LIBRARY}")
20+
else(CUNIT_FOUND)
21+
message(STATUS "Could not find CUnit. Tests will not be available.")
22+
endif(CUNIT_FOUND)
2823

2924
mark_as_advanced(CUNIT_INCLUDE_DIR CUNIT_LIBRARY CUNIT_SEARCH_PATHS)

cmake-scripts/FindEpoxy.cmake

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
set(EPOXY_SEARCH_PATHS /usr/local /usr /opt)
22

3-
find_path(EPOXY_INCLUDE_DIR epoxy/gl.h
4-
HINTS
5-
PATH_SUFFIXES include
6-
PATHS ${EPOXY_SEARCH_PATHS}
7-
)
8-
find_library(EPOXY_LIBRARY epoxy
9-
HINTS
10-
PATH_SUFFIXES lib64 lib
11-
PATHS ${EPOXY_SEARCH_PATHS}
12-
)
3+
find_path(
4+
EPOXY_INCLUDE_DIR epoxy/gl.h
5+
HINTS
6+
PATH_SUFFIXES include
7+
PATHS ${EPOXY_SEARCH_PATHS})
8+
find_library(
9+
EPOXY_LIBRARY epoxy
10+
HINTS
11+
PATH_SUFFIXES lib64 lib
12+
PATHS ${EPOXY_SEARCH_PATHS})
1313

14-
if (EPOXY_INCLUDE_DIR AND EPOXY_LIBRARY)
15-
set(EPOXY_FOUND TRUE)
16-
endif ()
14+
if(EPOXY_INCLUDE_DIR AND EPOXY_LIBRARY)
15+
set(EPOXY_FOUND TRUE)
16+
endif()
1717

18-
if (EPOXY_FOUND)
19-
add_library(Epoxy::Main UNKNOWN IMPORTED)
20-
set_target_properties(Epoxy::Main PROPERTIES
21-
IMPORTED_LOCATION "${EPOXY_LIBRARY}"
22-
INTERFACE_INCLUDE_DIRECTORIES "${EPOXY_INCLUDE_DIR}")
23-
message(STATUS "Found libepoxy: ${EPOXY_LIBRARY}")
24-
else ()
25-
message(WARNING "Could not find libepoxy")
26-
endif ()
18+
if(EPOXY_FOUND)
19+
add_library(Epoxy::Main UNKNOWN IMPORTED)
20+
set_target_properties(
21+
Epoxy::Main PROPERTIES IMPORTED_LOCATION "${EPOXY_LIBRARY}"
22+
INTERFACE_INCLUDE_DIRECTORIES "${EPOXY_INCLUDE_DIR}")
23+
message(STATUS "Found libepoxy: ${EPOXY_LIBRARY}")
24+
else()
25+
message(WARNING "Could not find libepoxy")
26+
endif()
2727

2828
mark_as_advanced(EPOXY_INCLUDE_DIR EPOXY_LIBRARY EPOXY_SEARCH_PATHS)

0 commit comments

Comments
 (0)