conanfile.py: drop the lockfile, rely on just force=True

valgur · Nov 14, 2024 · 2e8ed17 · 2e8ed17
1 parent 267bf10
commit 2e8ed17
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 34 deletions.
diff --git a/cmake/ThirdParty.cmake b/cmake/ThirdParty.cmake
@@ -12,9 +12,6 @@ if(USE_CONAN)
         message(FATAL_ERROR "Automatic Conan integration requires CMake 3.24 or later.")
     endif()
     include("${CMAKE_CURRENT_LIST_DIR}/SetDefaultProfile.cmake")
-    # Use a lockfile to keep the Conan recipe revisions fixed.
-    # Can be updated with `conan lock create . -r conancenter`.
-    set(CONAN_INSTALL_ARGS --build=missing --lockfile=${CMAKE_SOURCE_DIR}/conan.lock CACHE STRING "")
     list(APPEND CMAKE_PROJECT_TOP_LEVEL_INCLUDES ${CMAKE_CURRENT_LIST_DIR}/conan_provider.cmake)
 endif()
 

diff --git a/conan.lock b/conan.lock