Skip to content

Commit 7364ae7

Browse files
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
1 parent 9779ba0 commit 7364ae7

File tree

32 files changed

+175
-64
lines changed

32 files changed

+175
-64
lines changed

cmake/CompilerWarnings.cmake

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,5 +73,10 @@ set(
7373

7474
# Disable warnings that are problematic when enabled in certain compilers
7575
if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 8.0))
76-
string(REPLACE -Wduplicated-branches -Wno-duplicated-branches GCC_WARNINGS "${GCC_WARNINGS}")
76+
string(
77+
REPLACE -Wduplicated-branches
78+
-Wno-duplicated-branches
79+
GCC_WARNINGS
80+
"${GCC_WARNINGS}"
81+
)
7782
endif()

cmake/Install.cmake

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ install(
2020
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
2121
PRIVATE_HEADER
2222
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
23-
INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
23+
INCLUDES DESTINATION
24+
"${CMAKE_INSTALL_INCLUDEDIR}"
2425
)
2526

2627
install(
@@ -66,7 +67,8 @@ install(
6667
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
6768
PRIVATE_HEADER
6869
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
69-
INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
70+
INCLUDES DESTINATION
71+
"${CMAKE_INSTALL_INCLUDEDIR}"
7072
)
7173

7274
install(

cmake/hictkConfig.cmake.in

Lines changed: 85 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -10,33 +10,98 @@ set(HICTK_WITH_ARROW @HICTK_WITH_ARROW@)
1010
include(CMakeFindDependencyMacro)
1111

1212
if(HICTK_WITH_ARROW)
13-
find_dependency(Arrow CONFIG QUIET REQUIRED)
13+
find_dependency(
14+
Arrow
15+
CONFIG
16+
QUIET
17+
REQUIRED
18+
)
1419
endif()
1520

16-
find_dependency(bshoshany-thread-pool CONFIG QUIET REQUIRED)
17-
find_dependency(concurrentqueue CONFIG QUIET REQUIRED)
21+
find_dependency(
22+
bshoshany-thread-pool
23+
CONFIG
24+
QUIET
25+
REQUIRED
26+
)
27+
find_dependency(
28+
concurrentqueue
29+
CONFIG
30+
QUIET
31+
REQUIRED
32+
)
1833

1934
if(HICTK_WITH_EIGEN)
20-
find_dependency(Eigen3 CONFIG QUIET REQUIRED)
21-
endif()
22-
23-
find_dependency(FastFloat CONFIG QUIET REQUIRED)
24-
find_dependency(FMT CONFIG QUIET REQUIRED)
25-
find_dependency(
26-
HDF5
35+
find_dependency(
36+
Eigen3
2737
CONFIG
2838
QUIET
2939
REQUIRED
30-
COMPONENTS
31-
C
32-
)
33-
find_dependency(HighFive CONFIG QUIET REQUIRED)
34-
find_dependency(libdeflate CONFIG QUIET REQUIRED)
35-
find_dependency(phmap CONFIG QUIET REQUIRED)
36-
find_dependency(readerwriterqueue CONFIG QUIET REQUIRED)
37-
find_dependency(span-lite CONFIG QUIET REQUIRED)
38-
find_dependency(spdlog CONFIG QUIET REQUIRED)
39-
find_dependency(zstd CONFIG QUIET REQUIRED)
40+
)
41+
endif()
42+
43+
find_dependency(
44+
FastFloat
45+
CONFIG
46+
QUIET
47+
REQUIRED
48+
)
49+
find_dependency(
50+
FMT
51+
CONFIG
52+
QUIET
53+
REQUIRED
54+
)
55+
find_dependency(
56+
HDF5
57+
CONFIG
58+
QUIET
59+
REQUIRED
60+
COMPONENTS
61+
C
62+
)
63+
find_dependency(
64+
HighFive
65+
CONFIG
66+
QUIET
67+
REQUIRED
68+
)
69+
find_dependency(
70+
libdeflate
71+
CONFIG
72+
QUIET
73+
REQUIRED
74+
)
75+
find_dependency(
76+
phmap
77+
CONFIG
78+
QUIET
79+
REQUIRED
80+
)
81+
find_dependency(
82+
readerwriterqueue
83+
CONFIG
84+
QUIET
85+
REQUIRED
86+
)
87+
find_dependency(
88+
span-lite
89+
CONFIG
90+
QUIET
91+
REQUIRED
92+
)
93+
find_dependency(
94+
spdlog
95+
CONFIG
96+
QUIET
97+
REQUIRED
98+
)
99+
find_dependency(
100+
zstd
101+
CONFIG
102+
QUIET
103+
REQUIRED
104+
)
40105

41106
include("${CMAKE_CURRENT_LIST_DIR}/hictkInternalTargets.cmake")
42107
include("${CMAKE_CURRENT_LIST_DIR}/hictkTargets.cmake")

src/hictk/build_metadata/CMakeLists.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,12 @@ set(
6767
foreach(PKG ${HICTK_DEPENDENCIES})
6868
find_package(${PKG} REQUIRED QUIET)
6969
string(TOUPPER ${PKG} PKG_UPPER)
70-
string(REGEX REPLACE "[^a-zA-Z0-9_]" _ PKG_NORMALIZED ${PKG_UPPER})
70+
string(
71+
REGEX REPLACE "[^a-zA-Z0-9_]"
72+
_
73+
PKG_NORMALIZED
74+
${PKG_UPPER}
75+
)
7176
target_compile_definitions(
7277
hictk_internal_tools_build_metadata
7378
PRIVATE

src/libhictk/balancing/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ target_sources(
1414
hictk_internal_balancing
1515
INTERFACE
1616
FILE_SET HEADERS
17-
BASE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/include"
17+
BASE_DIRS
18+
"${CMAKE_CURRENT_SOURCE_DIR}/include"
1819
FILES
1920
"${CMAKE_CURRENT_SOURCE_DIR}/include/hictk/balancing/common.hpp"
2021
"${CMAKE_CURRENT_SOURCE_DIR}/include/hictk/balancing/ice.hpp"

src/libhictk/bin_table/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ target_sources(
88
hictk_internal_bin_table
99
INTERFACE
1010
FILE_SET HEADERS
11-
BASE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/include"
11+
BASE_DIRS
12+
"${CMAKE_CURRENT_SOURCE_DIR}/include"
1213
FILES
1314
"${CMAKE_CURRENT_SOURCE_DIR}/include/hictk/bin.hpp"
1415
"${CMAKE_CURRENT_SOURCE_DIR}/include/hictk/bin_table.hpp"

src/libhictk/binary_buffer/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ target_sources(
99
hictk_internal_binary_buffer
1010
INTERFACE
1111
FILE_SET HEADERS
12-
BASE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/include"
12+
BASE_DIRS
13+
"${CMAKE_CURRENT_SOURCE_DIR}/include"
1314
FILES
1415
"${CMAKE_CURRENT_SOURCE_DIR}/include/hictk/binary_buffer.hpp"
1516
"${CMAKE_CURRENT_SOURCE_DIR}/include/hictk/impl/binary_buffer_impl.hpp"

src/libhictk/chromosome/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ target_sources(
99
hictk_internal_chromosome
1010
INTERFACE
1111
FILE_SET HEADERS
12-
BASE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/include"
12+
BASE_DIRS
13+
"${CMAKE_CURRENT_SOURCE_DIR}/include"
1314
FILES
1415
"${CMAKE_CURRENT_SOURCE_DIR}/include/hictk/chromosome.hpp"
1516
"${CMAKE_CURRENT_SOURCE_DIR}/include/hictk/impl/chromosome_impl.hpp"

src/libhictk/common/common/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ target_sources(
99
hictk_internal_common
1010
INTERFACE
1111
FILE_SET HEADERS
12-
BASE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/include"
12+
BASE_DIRS
13+
"${CMAKE_CURRENT_SOURCE_DIR}/include"
1314
FILES
1415
"${CMAKE_CURRENT_SOURCE_DIR}/include/hictk/common.hpp"
1516
"${CMAKE_CURRENT_SOURCE_DIR}/include/hictk/suppress_warnings.hpp"

src/libhictk/common/default_delete_libdeflate/CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,10 @@ target_sources(
1111
hictk_internal_common_default_delete_libdeflate
1212
INTERFACE
1313
FILE_SET HEADERS
14-
BASE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/include"
15-
FILES "${CMAKE_CURRENT_SOURCE_DIR}/include/hictk/default_delete_libdeflate.hpp"
14+
BASE_DIRS
15+
"${CMAKE_CURRENT_SOURCE_DIR}/include"
16+
FILES
17+
"${CMAKE_CURRENT_SOURCE_DIR}/include/hictk/default_delete_libdeflate.hpp"
1618
)
1719

1820
target_include_directories(

0 commit comments

Comments
 (0)