diff --git a/CMakePresets.json b/CMakePresets.json index 07cb3684..80247a7d 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -18,7 +18,7 @@ "cacheVariables": { "TESTNET": "ON", "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": { "TESTNET": "OFF", "CMAKE_BUILD_TYPE": "Release", - "CMAKE_PROJECT_TOP_LEVEL_INCLUDES":"cmake/conan_provider.cmake" + "CMAKE_PROJECT_TOP_LEVEL_INCLUDES":"cmake/ConanProvider.cmake" } } ], diff --git a/Makefile b/Makefile index 914e0606..c0de80b1 100644 --- a/Makefile +++ b/Makefile @@ -140,7 +140,7 @@ test-debug: # allowing this target to error quietly saves cross brwoser file detection 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 login conan_build $(CONAN_USER) -p $(CONAN_PASSWORD)) || true diff --git a/cmake/GetConan.cmake b/cmake/ConanGet.cmake similarity index 99% rename from cmake/GetConan.cmake rename to cmake/ConanGet.cmake index 9b7437ee..6110328e 100644 --- a/cmake/GetConan.cmake +++ b/cmake/ConanGet.cmake @@ -1,4 +1,4 @@ -# cmake/GetConan.cmake +# cmake/ConanGet.cmake # This module downloads and installs Conan if it's not found. diff --git a/cmake/conan_provider.cmake b/cmake/ConanProvider.cmake similarity index 99% rename from cmake/conan_provider.cmake rename to cmake/ConanProvider.cmake index c524fb7f..036ede6e 100644 --- a/cmake/conan_provider.cmake +++ b/cmake/ConanProvider.cmake @@ -572,7 +572,7 @@ macro(conan_provide_dependency method package_name) endif () if(NOT EXISTS ${CONAN_COMMAND}) 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 WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}") if(NOT result EQUAL 0)