|
13 | 13 | "generator": "Unix Makefiles",
|
14 | 14 | "binaryDir": "${sourceDir}/out/build/${presetName}",
|
15 | 15 | "environment": { "CMAKE_BUILD_PARALLEL_LEVEL": "" },
|
16 |
| - // remove when using conan_provider.cmake |
17 |
| - "toolchainFile": "${sourceDir}/out/build/${presetName}/build/Debug/generators/conan_toolchain.cmake", |
18 | 16 | "cacheVariables": {
|
19 | 17 | "CMAKE_BUILD_TYPE": "Debug",
|
20 | 18 | "CONAN_INSTALL_ARGS": "-sbuild_type=Debug;--build=missing",
|
21 |
| - "CMAKE_PROJECT_INCLUDE_BEFORE": "$env{HOME}/.conan2/extensions/cmake/conan_install.cmake", |
22 |
| - //"CMAKE_PROJECT_TOP_LEVEL_INCLUDES": "${sourceDir}/cmake-conan/conan_provider.cmake", |
| 19 | + "CMAKE_PROJECT_TOP_LEVEL_INCLUDES": "${sourceDir}/cmake-conan/conan_provider.cmake", |
23 | 20 | "CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}"
|
24 | 21 | },
|
25 | 22 | "vendor": { "microsoft.com/VisualStudioRemoteSettings/CMake/2.0": { "remoteSourceRootDir": "$env{HOME}/.vs/$ms{projectDirName}" } },
|
|
35 | 32 | "CMAKE_BUILD_PARALLEL_LEVEL": "",
|
36 | 33 | "REMOTE_DEBUG_MACHINE": "192.168.110.10"
|
37 | 34 | },
|
38 |
| - // remove when using conan_provider.cmake |
39 |
| - "toolchainFile": "${sourceDir}/out/build/${presetName}/build/Debug/generators/conan_toolchain.cmake", |
40 | 35 | "cacheVariables": {
|
41 | 36 | "CMAKE_BUILD_TYPE": "Debug",
|
42 | 37 | "CONAN_HOST_PROFILE": "cube3210",
|
43 | 38 | "CONAN_INSTALL_ARGS": "-sbuild_type=Debug;--build=missing",
|
44 |
| - "CMAKE_PROJECT_INCLUDE_BEFORE": "$env{HOME}/.conan2/extensions/cmake/conan_install.cmake", |
45 |
| - //"CMAKE_PROJECT_TOP_LEVEL_INCLUDES": "${sourceDir}/cmake-conan/conan_provider.cmake", |
| 39 | + "CMAKE_PROJECT_TOP_LEVEL_INCLUDES": "${sourceDir}/cmake-conan/conan_provider.cmake", |
46 | 40 | "CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}"
|
47 | 41 | },
|
48 | 42 | "vendor": { "microsoft.com/VisualStudioRemoteSettings/CMake/2.0": { "remoteSourceRootDir": "$env{HOME}/.vs/$ms{projectDirName}" } },
|
|
58 | 52 | "CMAKE_BUILD_PARALLEL_LEVEL": "",
|
59 | 53 | "REMOTE_DEBUG_MACHINE": "192.168.110.10"
|
60 | 54 | },
|
61 |
| - // remove when using conan_provider.cmake |
62 |
| - "toolchainFile": "${sourceDir}/out/build/${presetName}/build/Debug/generators/conan_toolchain.cmake", |
63 | 55 | "cacheVariables": {
|
64 | 56 | "CMAKE_BUILD_TYPE": "Debug",
|
65 | 57 | "CONAN_HOST_PROFILE": "showcase",
|
66 | 58 | "CONAN_INSTALL_ARGS": "-sbuild_type=Debug;--build=missing",
|
67 |
| - "CMAKE_PROJECT_INCLUDE_BEFORE": "$env{HOME}/.conan2/extensions/cmake/conan_install.cmake", |
68 |
| - //"CMAKE_PROJECT_TOP_LEVEL_INCLUDES": "${sourceDir}/cmake-conan/conan_provider.cmake", |
| 59 | + "CMAKE_PROJECT_TOP_LEVEL_INCLUDES": "${sourceDir}/cmake-conan/conan_provider.cmake", |
69 | 60 | "CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}"
|
70 | 61 | },
|
71 | 62 | "vendor": { "microsoft.com/VisualStudioRemoteSettings/CMake/2.0": { "remoteSourceRootDir": "$env{HOME}/.vs/$ms{projectDirName}" } },
|
|
0 commit comments