Skip to content

Commit 930b218

Browse files
eigendudeeigendude
committed
CMake: Prefix libraries to avoid name clashes
1 parent f364edb commit 930b218

File tree

105 files changed

+639
-616
lines changed

Some content is hidden

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

105 files changed

+639
-616
lines changed

‎core/adt/CMakeLists.txt

+14-14
Original file line numberDiff line numberDiff line change
@@ -3,31 +3,31 @@
33
# SPDX-License-Identifier: Apache-2.0
44
#
55

6-
add_custom_target(adt
6+
add_custom_target(filecoin_adt
77
DEPENDS
8-
array
9-
multimap
8+
filecoin_array
9+
filecoin_multimap
1010
)
1111

12-
add_library(array
12+
add_library(filecoin_array
1313
impl/array.cpp
1414
)
15-
target_link_libraries(array
16-
amt
15+
target_link_libraries(filecoin_array
16+
filecoin_amt
1717
)
1818

19-
add_library(balance_table_hamt
19+
add_library(filecoin_balance_table_hamt
2020
impl/balance_table_hamt.cpp
2121
)
22-
target_link_libraries(balance_table_hamt
23-
address
24-
hamt
22+
target_link_libraries(filecoin_balance_table_hamt
23+
filecoin_address
24+
filecoin_hamt
2525
)
2626

27-
add_library(multimap
27+
add_library(filecoin_multimap
2828
impl/multimap.cpp
2929
)
30-
target_link_libraries(multimap
31-
array
32-
hamt
30+
target_link_libraries(filecoin_multimap
31+
filecoin_array
32+
filecoin_hamt
3333
)

‎core/blockchain/CMakeLists.txt

+6-6
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66
add_subdirectory(message_pool)
77
add_subdirectory(production)
88

9-
add_library(block_validator
9+
add_library(filecoin_block_validator
1010
impl/block_validator_impl.cpp
1111
)
12-
target_link_libraries(block_validator
13-
block
12+
target_link_libraries(filecoin_block_validator
13+
filecoin_block
1414
)
1515

16-
add_library(weight_calculator
16+
add_library(filecoin_weight_calculator
1717
impl/weight_calculator_impl.cpp
1818
)
19-
target_link_libraries(weight_calculator
20-
tipset
19+
target_link_libraries(filecoin_weight_calculator
20+
filecoin_tipset
2121
)

‎core/blockchain/message_pool/CMakeLists.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
# SPDX-License-Identifier: Apache-2.0
44
#
55

6-
add_library(message_pool
6+
add_library(filecoin_message_pool
77
impl/gas_price_scored_message_storage.cpp
88
impl/message_pool_error.cpp)
9-
target_link_libraries(message_pool
10-
outcome
11-
message
9+
target_link_libraries(filecoin_message_pool
10+
filecoin_outcome
11+
filecoin_message
1212
)

‎core/blockchain/production/CMakeLists.txt

+10-10
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
#SPDX - License - Identifier : Apache - 2.0
44
#
55

6-
add_library(block_producer
6+
add_library(filecoin_block_producer
77
impl/block_producer_impl.cpp
88
)
9-
target_link_libraries(block_producer
10-
bls_provider
11-
outcome
12-
buffer
13-
address
14-
clock
15-
interpreter
16-
tipset
17-
ipfs_datastore_in_memory
9+
target_link_libraries(filecoin_block_producer
10+
filecoin_bls_provider
11+
filecoin_outcome
12+
filecoin_buffer
13+
filecoin_address
14+
filecoin_clock
15+
filecoin_interpreter
16+
filecoin_tipset
17+
filecoin_ipfs_datastore_in_memory
1818
)

‎core/clock/CMakeLists.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
# SPDX-License-Identifier: Apache-2.0
44
#
55

6-
add_library(clock
6+
add_library(filecoin_clock
77
chain_epoch_clock.cpp
88
impl/chain_epoch_clock_impl.cpp
99
impl/utc_clock_impl.cpp
1010
time.cpp
1111
)
12-
target_compile_definitions(clock PRIVATE
12+
target_compile_definitions(filecoin_clock PRIVATE
1313
BOOST_DATE_TIME_POSIX_TIME_STD_CONFIG
1414
)
15-
target_link_libraries(clock
15+
target_link_libraries(filecoin_clock
1616
Boost::date_time
17-
outcome
17+
filecoin_outcome
1818
p2p::p2p_uvarint
1919
)

‎core/codec/cbor/CMakeLists.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
# SPDX-License-Identifier: Apache-2.0
44
#
55

6-
add_library(cbor
6+
add_library(filecoin_cbor
77
cbor_decode_stream.cpp
88
cbor_encode_stream.cpp
99
cbor_errors.cpp
1010
cbor_resolve.cpp
1111
)
12-
target_link_libraries(cbor
13-
cid
14-
outcome
12+
target_link_libraries(filecoin_cbor
13+
filecoin_cid
14+
filecoin_outcome
1515
tinycbor
1616
)

‎core/codec/rle/CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
add_library(rle_plus_codec
1+
add_library(filecoin_rle_plus_codec
22
rle_plus_encoding_stream.cpp
33
rle_plus_errors.cpp
44
)
55

6-
target_link_libraries(rle_plus_codec
6+
target_link_libraries(filecoin_rle_plus_codec
77
Boost::boost
8-
outcome
8+
filecoin_outcome
99
)

‎core/common/CMakeLists.txt

+13-13
Original file line numberDiff line numberDiff line change
@@ -3,41 +3,41 @@
33
# SPDX-License-Identifier: Apache-2.0
44
#
55

6-
add_library(hexutil
6+
add_library(filecoin_hexutil
77
hexutil.hpp
88
hexutil.cpp
99
)
10-
target_link_libraries(hexutil
10+
target_link_libraries(filecoin_hexutil
1111
Boost::boost
12-
outcome
12+
filecoin_outcome
1313
)
1414

15-
add_library(blob
15+
add_library(filecoin_blob
1616
blob.hpp
1717
blob.cpp
1818
)
19-
target_link_libraries(blob
20-
hexutil
19+
target_link_libraries(filecoin_blob
20+
filecoin_hexutil
2121
)
2222

23-
add_library(outcome INTERFACE)
24-
target_link_libraries(outcome INTERFACE
23+
add_library(filecoin_outcome INTERFACE)
24+
target_link_libraries(filecoin_outcome INTERFACE
2525
Boost::boost
2626
p2p::p2p
2727
)
2828

29-
add_library(buffer
29+
add_library(filecoin_buffer
3030
buffer.hpp
3131
buffer.cpp
3232
buffer_back_insert_iterator.cpp
3333
)
34-
target_link_libraries(buffer
35-
hexutil
34+
target_link_libraries(filecoin_buffer
35+
filecoin_hexutil
3636
)
3737

38-
add_library(logger
38+
add_library(filecoin_logger
3939
logger.cpp
4040
)
41-
target_link_libraries(logger
41+
target_link_libraries(filecoin_logger
4242
spdlog::spdlog
4343
)

‎core/crypto/blake2/CMakeLists.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
# SPDX-License-Identifier: Apache-2.0
44
#
55

6-
add_library(blake2
6+
add_library(filecoin_blake2
77
blake2s.c
88
blake2b.c
99
blake2b160.cpp
1010
)
11-
target_link_libraries(blake2
12-
blob
13-
outcome
11+
target_link_libraries(filecoin_blake2
12+
filecoin_blob
13+
filecoin_outcome
1414
)

‎core/crypto/bls/CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
# SPDX-License-Identifier: Apache-2.0
44
#
55

6-
add_library(bls_provider
6+
add_library(filecoin_bls_provider
77
impl/bls_provider_impl.cpp
88
)
99

10-
target_link_libraries(bls_provider
10+
target_link_libraries(filecoin_bls_provider
1111
bls_signatures_ffi
12-
outcome
12+
filecoin_outcome
1313
)

‎core/crypto/hasher/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ add_library(filecoin_hasher
77
hasher.cpp
88
)
99
target_link_libraries(filecoin_hasher
10-
blake2
10+
filecoin_blake2
1111
)

‎core/crypto/murmur/CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
# SPDX-License-Identifier: Apache-2.0
44
#
55

6-
add_library(murmur
6+
add_library(filecoin_murmur
77
murmur.cpp
88
)
9-
target_link_libraries(murmur
10-
buffer
9+
target_link_libraries(filecoin_murmur
10+
filecoin_buffer
1111
)

‎core/crypto/randomness/CMakeLists.txt

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
# Copyright Soramitsu Co., Ltd. All Rights Reserved.
22
# SPDX-License-Identifier: Apache-2.0
33

4-
add_library(randomness_provider
4+
add_library(filecoin_randomness_provider
55
impl/randomness_provider_impl.cpp
66
)
7-
target_link_libraries(randomness_provider
7+
target_link_libraries(filecoin_randomness_provider
88
Boost::boost
9-
blob
10-
buffer
9+
filecoin_blob
10+
filecoin_buffer
1111
p2p::p2p_sha
1212
)
1313

14-
add_library(chain_randomness_provider
14+
add_library(filecoin_chain_randomness_provider
1515
impl/chain_randomness_provider_impl.cpp
1616
)
17-
target_link_libraries(chain_randomness_provider
17+
target_link_libraries(filecoin_chain_randomness_provider
1818
Boost::boost
19-
blob
20-
buffer
19+
filecoin_blob
20+
filecoin_buffer
2121
p2p::p2p_sha
2222
)

‎core/crypto/signature/CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
# SPDX-License-Identifier: Apache-2.0
44
#
55

6-
add_library(signature
6+
add_library(filecoin_signature
77
signature.cpp
88
)
9-
target_link_libraries(signature
10-
outcome
9+
target_link_libraries(filecoin_signature
10+
filecoin_outcome
1111
)

‎core/crypto/vrf/CMakeLists.txt

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# Copyright Soramitsu Co., Ltd. All Rights Reserved.
22
# SPDX-License-Identifier: Apache-2.0
33

4-
add_library(vrf_provider
4+
add_library(filecoin_vrf_provider
55
impl/vrf_provider_impl.cpp
66
vrf_hash_encoder.cpp
77
vrf_types.cpp
88
)
9-
target_link_libraries(vrf_provider
10-
address
11-
blob
12-
buffer
9+
target_link_libraries(filecoin_vrf_provider
10+
filecoin_address
11+
filecoin_blob
12+
filecoin_buffer
1313
p2p::p2p_sha
1414
)

‎core/fslock/CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
# SPDX-License-Identifier: Apache-2.0
44
#
55

6-
add_library(fslock
6+
add_library(filecoin_fslock
77
fslock.cpp
88
fslock_error.cpp
99
)
1010

11-
target_link_libraries(fslock
12-
outcome
11+
target_link_libraries(filecoin_fslock
12+
filecoin_outcome
1313
)

‎core/power/CMakeLists.txt

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
# Copyright Soramitsu Co., Ltd. All Rights Reserved.
22
# SPDX-License-Identifier: Apache-2.0
33

4-
add_library(power_table
4+
add_library(filecoin_power_table
55
impl/power_table_impl.cpp
66
impl/power_table_error.cpp
77
)
8-
target_link_libraries(power_table
9-
address
10-
outcome
8+
target_link_libraries(filecoin_power_table
9+
filecoin_address
10+
filecoin_outcome
1111
)
1212

13-
add_library(power_table_hamt
13+
add_library(filecoin_power_table_hamt
1414
impl/power_table_hamt.cpp
1515
impl/power_table_error.cpp
1616
)
17-
target_link_libraries(power_table_hamt
18-
address
19-
outcome
20-
hamt
17+
target_link_libraries(filecoin_power_table_hamt
18+
filecoin_address
19+
filecoin_outcome
20+
filecoin_hamt
2121
)

0 commit comments

Comments
 (0)