Skip to content

Commit 1bac0d0

Browse files
committed
Merge branch 'develop'
2 parents 0a62378 + 4e988bb commit 1bac0d0

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

README.adoc

+11-8
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,10 @@ it becomes the responsibility of the component itself to take extra measures and
7373
This might contrast with a traditional approach where the burden was on downstream(s) to adapt to the libraries it uses,
7474
which often lead the organisations adhering to this isolation mental model to stay away from external dependencies as much as possible.
7575

76-
==== The best process in the world
76+
==== The best process in the world?
7777

7878
> \... actually does not sound anything like this doc.
79+
> -- Tenacious C
7980

8081
Yet the Platonic ideal sets the cap.
8182

@@ -196,10 +197,10 @@ The idea of manually having to clone and separately build a handful of independe
196197
for even medium-sized applications should trigger the maintainability alarm.
197198

198199
Different approaches and tools exist to manage multi-repos. Git link:https://github.blog/2016-02-01-working-with-submodules[`submodule`] is an easily accessible tool, since it is integrated with core Git installations. Yet, a recurrent criticism is submodules do not scale well as they are unpractical to use.
199-
In particular, the less orthogonal the submodules/module, the more this can become a problem.
200+
In particular, the more correlated the submodules/module, the more this can become a problem.
200201

201202
[NOTE]
202-
.Orthogonality measure
203+
.Correlation measure
203204
====
204205
Likeliness that changes in entity B would coherently happen alongside changes in entity A.
205206
====
@@ -1497,9 +1498,9 @@ class MyRepositoryConan(ConanFile):
14971498
}
14981499

14991500
# Code dependencies
1500-
requires = "upstreamone/1.0@one/stable",
1501+
requires = ("upstreamone/1.0@one/stable",
15011502
"upstreamtwo/[>1.0]@two/stable",
1502-
"upstreamthree/[~=3.2.5]@three/stable"
1503+
"upstreamthree/[~=3.2.5]@three/stable")
15031504

15041505
# Build dependencies
15051506
# CMake will not need to be installed to build the project
@@ -1678,8 +1679,8 @@ and introducing an additional CMake script to glue them together:
16781679
.conan/customconan.cmake
16791680
[source, cmake]
16801681
----
1681-
# Made a function to avoid leaking the variables defined within conanbuildinfo.cmake
1682-
function(conan_handle_compiler_settings)
1682+
# Cannot be a function: some invoked macro modify global variables
1683+
macro(conan_handle_compiler_settings)
16831684
include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
16841685

16851686
if(CONAN_EXPORTED)
@@ -1694,7 +1695,7 @@ function(conan_handle_compiler_settings)
16941695
conan_set_std()
16951696
conan_set_libcxx()
16961697
conan_set_vs_runtime()
1697-
endfunction()
1698+
endmacro()
16981699

16991700
include(${CMAKE_BINARY_DIR}/conan_paths.cmake)
17001701
conan_handle_compiler_settings()
@@ -1828,6 +1829,8 @@ class MyRepositoryTestConan(ConanFile):
18281829
settings = "os", "compiler", "build_type", "arch"
18291830
generators = "cmake_paths", "cmake"
18301831

1832+
build_requires = "cmake_installer/3.15.4@conan/stable"
1833+
18311834
def build(self):
18321835
cmake = CMake(self)
18331836
cmake.definitions["CMAKE_PROJECT_PackageTest_INCLUDE"] = "../customconan.cmake"

0 commit comments

Comments
 (0)