File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -10,126 +10,3 @@ markup:
1010 bullet_char : " *"
1111 enum_char : .
1212 enable_markup : false
13- parse :
14- additional_commands :
15- project_options :
16- pargs :
17- nargs : " *"
18- flags : []
19- spelling : project_options
20- kwargs :
21- CLANG_WARNINGS : 1
22- GCC_WARNINGS : 1
23- MSVC_WARNINGS : 1
24- CONAN_OPTIONS : +
25- catch_discover_tests :
26- pargs :
27- nargs : " *"
28- flags : []
29- kwargs :
30- OUTPUT_DIR : 1
31- OUTPUT_PREFIX : 1
32- OUTPUT_SUFFIX : 1
33- REPORTER : 1
34- TEST_PREFIX : 1
35- conan_add_remote :
36- pargs :
37- nargs : " *"
38- flags : []
39- kwargs :
40- INDEX : 1
41- NAME : 1
42- URL : 1
43- conan_cmake_install :
44- pargs :
45- nargs : " *"
46- flags : []
47- kwargs :
48- BUILD : +
49- INSTALL_FOLDER : 1
50- LOCKFILE : 1
51- LOCKFILE_NODE_ID : 1
52- LOCKFILE_OUT : 1
53- PATH_OR_REFERENCE : 1
54- REFERENCE : 1
55- REMOTE : 1
56- ENV : +
57- ENV_BUILD : +
58- ENV_HOST : +
59- GENERATOR : +
60- OPTIONS : +
61- OPTIONS_BUILD : +
62- OPTIONS_HOST : +
63- PROFILE : +
64- PROFILE_BUILD : +
65- PROFILE_HOST : +
66- SETTINGS : +
67- SETTINGS_BUILD : +
68- SETTINGS_HOST : +
69- cpmaddpackage :
70- pargs :
71- nargs : " *"
72- flags : []
73- spelling : CPMAddPackage
74- kwargs : &id001
75- DOWNLOAD_COMMAND : 1
76- DOWNLOAD_NAME : 1
77- DOWNLOAD_NO_EXTRACT : 1
78- DOWNLOAD_ONLY : 1
79- FIND_PACKAGE_ARGUMENTS : 1
80- FORCE : 1
81- GITHUB_REPOSITORY : 1
82- GITLAB_REPOSITORY : 1
83- GIT_REPOSITORY : 1
84- GIT_SHALLOW : 1
85- GIT_TAG : 1
86- HTTP_PASSWORD : 1
87- HTTP_USERNAME : 1
88- NAME : 1
89- NO_CACHE : 1
90- SOURCE_DIR : 1
91- SVN_REPOSITORY : 1
92- SVN_REVISION : 1
93- URL : 1
94- URL_HASH : 1
95- URL_MD5 : 1
96- VERSION : 1
97- OPTIONS : +
98- cpmfindpackage :
99- pargs :
100- nargs : " *"
101- flags : []
102- spelling : CPMFindPackage
103- kwargs : *id001
104- cpmdeclarepackage :
105- pargs :
106- nargs : " *"
107- flags : []
108- spelling : CPMDeclarePackage
109- kwargs : *id001
110- packageproject :
111- pargs :
112- nargs : " *"
113- flags : []
114- spelling : packageProject
115- kwargs :
116- BINARY_DIR : 1
117- COMPATIBILITY : 1
118- DISABLE_VERSION_SUFFIX : 1
119- EXPORT_HEADER : 1
120- INCLUDE_DESTINATION : 1
121- INCLUDE_DIR : 1
122- NAME : 1
123- NAMESPACE : 1
124- VERSION : 1
125- VERSION_HEADER : 1
126- DEPENDENCIES : +
127- cpmusepackagelock :
128- pargs : 1
129- spelling : CPMUsePackageLock
130- cpmregisterpackage :
131- pargs : 1
132- spelling : CPMRegisterPackage
133- cpmgetpackageversion :
134- pargs : 2
135- spelling : CPMGetPackageVersion
Original file line number Diff line number Diff line change @@ -19,10 +19,17 @@ macro(run_conan)
1919 # Add (or remove) remotes as needed
2020 # conan_add_remote(NAME conan-center URL https://conan.bintray.com)
2121 conan_add_remote (
22- NAME cci
23- URL https://center.conan.io
24- INDEX 0 )
25- conan_add_remote (NAME bincrafters URL https://bincrafters.jfrog.io/artifactory/api/conan/public-conan )
22+ NAME
23+ cci
24+ URL
25+ https://center.conan.io
26+ INDEX
27+ 0 )
28+ conan_add_remote (
29+ NAME
30+ bincrafters
31+ URL
32+ https://bincrafters.jfrog.io/artifactory/api/conan/public-conan )
2633
2734 # For multi configuration generators, like VS and XCode
2835 if (NOT CMAKE_CONFIGURATION_TYPES )
@@ -43,13 +50,19 @@ macro(run_conan)
4350 # the external "conanfile.py" provided with the project
4451 # Alternatively a conanfile.txt could be used
4552 conan_cmake_install (
46- PATH_OR_REFERENCE ${CMAKE_SOURCE_DIR}
47- BUILD missing
53+ PATH_OR_REFERENCE
54+ ${CMAKE_SOURCE_DIR}
55+ BUILD
56+ missing
4857 # Pass compile-time configured options into conan
49- OPTIONS ${ProjectOptions_CONAN_OPTIONS}
58+ OPTIONS
59+ ${ProjectOptions_CONAN_OPTIONS}
5060 # Pass CMake compilers to Conan
51- ENV "CC=${CMAKE_C_COMPILER} " "CXX=${CMAKE_CXX_COMPILER} "
52- SETTINGS ${settings} )
61+ ENV
62+ "CC=${CMAKE_C_COMPILER} "
63+ "CXX=${CMAKE_CXX_COMPILER} "
64+ SETTINGS
65+ ${settings} )
5366 endforeach ()
5467
5568endmacro ()
You can’t perform that action at this time.
0 commit comments