Charon/blockchain
1
0
Fork 0
forked from lthn/blockchain
Code Pull requests Activity

Rename Conan CMake scripts for consistency

Browse source 
Renamed 'GetConan.cmake' to 'ConanGet.cmake' and 'conan_provider.cmake' to 'ConanProvider.cmake' for consistent naming. Updated references in CMakePresets.json, Makefile, and related CMake scripts to reflect these changes.
This commit is contained in:
Snider 2025-10-10 12:55:05 +01:00
parent 2bb5eb7544
commit 4b1762f7f1
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakePresets.json
View file

@ -18,7 +18,7 @@
"cacheVariables": { "cacheVariables": {
"TESTNET": "ON", "TESTNET": "ON",
"CMAKE_BUILD_TYPE": "Release", "CMAKE_BUILD_TYPE": "Release",
"CMAKE_PROJECT_TOP_LEVEL_INCLUDES":"cmake/conan_provider.cmake" "CMAKE_PROJECT_TOP_LEVEL_INCLUDES":"cmake/ConanProvider.cmake"
} }
}, },
{ {
@ -30,7 +30,7 @@
"cacheVariables": { "cacheVariables": {
"TESTNET": "OFF", "TESTNET": "OFF",
"CMAKE_BUILD_TYPE": "Release", "CMAKE_BUILD_TYPE": "Release",
"CMAKE_PROJECT_TOP_LEVEL_INCLUDES":"cmake/conan_provider.cmake" "CMAKE_PROJECT_TOP_LEVEL_INCLUDES":"cmake/ConanProvider.cmake"
} }
} }
], ],

2
Makefile
View file

@ -140,7 +140,7 @@ test-debug:
# allowing this target to error quietly saves cross brwoser file detection # allowing this target to error quietly saves cross brwoser file detection
conan-get: conan-get:
cmake -P cmake/GetConan.cmake cmake -P cmake/ConanGet.cmake
(CONAN_HOME=$(CONAN_CACHE) $(CONAN_EXECUTABLE) remote add conan_build $(CONAN_URL) && \ (CONAN_HOME=$(CONAN_CACHE) $(CONAN_EXECUTABLE) remote add conan_build $(CONAN_URL) && \
CONAN_HOME=$(CONAN_CACHE) $(CONAN_EXECUTABLE) remote login conan_build $(CONAN_USER) -p $(CONAN_PASSWORD)) || true CONAN_HOME=$(CONAN_CACHE) $(CONAN_EXECUTABLE) remote login conan_build $(CONAN_USER) -p $(CONAN_PASSWORD)) || true

2
cmake/GetConan.cmake → cmake/ConanGet.cmake
View file

@ -1,4 +1,4 @@
# cmake/GetConan.cmake # cmake/ConanGet.cmake
# This module downloads and installs Conan if it's not found. # This module downloads and installs Conan if it's not found.

2
cmake/conan_provider.cmake → cmake/ConanProvider.cmake
View file

@ -572,7 +572,7 @@ macro(conan_provide_dependency method package_name)
endif () endif ()
if(NOT EXISTS ${CONAN_COMMAND}) if(NOT EXISTS ${CONAN_COMMAND})
message(STATUS "CMake-Conan: Local conan not found, attempting to download it.") message(STATUS "CMake-Conan: Local conan not found, attempting to download it.")
execute_process(COMMAND "${CMAKE_COMMAND}" -P "${CMAKE_SOURCE_DIR}/cmake/GetConan.cmake" execute_process(COMMAND "${CMAKE_COMMAND}" -P "${CMAKE_SOURCE_DIR}/cmake/ConanGet.cmake"
RESULT_VARIABLE result RESULT_VARIABLE result
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}") WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}")
if(NOT result EQUAL 0) if(NOT result EQUAL 0)