Skip to content

Commit 289ace8

Browse files
committed
Try to use conan-camke (conan_provider)
1 parent 0ef1a54 commit 289ace8

File tree

2 files changed

+4
-13
lines changed

2 files changed

+4
-13
lines changed

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ target_link_libraries(MyLib
2222
)
2323

2424
install(TARGETS MyLib COMPONENT CONAN)
25-
install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT CONAN)
25+
install(DIRECTORY include/ DESTINATION include COMPONENT CONAN)
2626

2727
# tests
2828
enable_testing()

CMakePresets.json

+3-12
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,10 @@
1313
"generator": "Unix Makefiles",
1414
"binaryDir": "${sourceDir}/out/build/${presetName}",
1515
"environment": { "CMAKE_BUILD_PARALLEL_LEVEL": "" },
16-
// remove when using conan_provider.cmake
17-
"toolchainFile": "${sourceDir}/out/build/${presetName}/build/Debug/generators/conan_toolchain.cmake",
1816
"cacheVariables": {
1917
"CMAKE_BUILD_TYPE": "Debug",
2018
"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",
2320
"CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}"
2421
},
2522
"vendor": { "microsoft.com/VisualStudioRemoteSettings/CMake/2.0": { "remoteSourceRootDir": "$env{HOME}/.vs/$ms{projectDirName}" } },
@@ -35,14 +32,11 @@
3532
"CMAKE_BUILD_PARALLEL_LEVEL": "",
3633
"REMOTE_DEBUG_MACHINE": "192.168.110.10"
3734
},
38-
// remove when using conan_provider.cmake
39-
"toolchainFile": "${sourceDir}/out/build/${presetName}/build/Debug/generators/conan_toolchain.cmake",
4035
"cacheVariables": {
4136
"CMAKE_BUILD_TYPE": "Debug",
4237
"CONAN_HOST_PROFILE": "cube3210",
4338
"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",
4640
"CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}"
4741
},
4842
"vendor": { "microsoft.com/VisualStudioRemoteSettings/CMake/2.0": { "remoteSourceRootDir": "$env{HOME}/.vs/$ms{projectDirName}" } },
@@ -58,14 +52,11 @@
5852
"CMAKE_BUILD_PARALLEL_LEVEL": "",
5953
"REMOTE_DEBUG_MACHINE": "192.168.110.10"
6054
},
61-
// remove when using conan_provider.cmake
62-
"toolchainFile": "${sourceDir}/out/build/${presetName}/build/Debug/generators/conan_toolchain.cmake",
6355
"cacheVariables": {
6456
"CMAKE_BUILD_TYPE": "Debug",
6557
"CONAN_HOST_PROFILE": "showcase",
6658
"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",
6960
"CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}"
7061
},
7162
"vendor": { "microsoft.com/VisualStudioRemoteSettings/CMake/2.0": { "remoteSourceRootDir": "$env{HOME}/.vs/$ms{projectDirName}" } },

0 commit comments

Comments
 (0)