at 24.05-pre 1.1 kB view raw
1diff --git a/CMakeLists.txt b/CMakeLists.txt 2index becd2ad03c..7e3c8c99b1 100644 3--- a/CMakeLists.txt 4+++ b/CMakeLists.txt 5@@ -27,7 +27,6 @@ cmake_policy(SET CMP0104 OLD) 6 7 include(cmake/archive.cmake) 8 include(cmake/common.cmake) 9-include(cmake/conan.cmake) 10 include(cmake/cuda.cmake) 11 include(cmake/cython.cmake) 12 include(cmake/fbs.cmake) 13@@ -37,21 +36,6 @@ include(cmake/recursive_library.cmake) 14 include(cmake/swig.cmake) 15 include(cmake/global_vars.cmake) 16 17-if (CMAKE_CROSSCOMPILING) 18- include(${CMAKE_BINARY_DIR}/conan_paths.cmake) 19-else() 20- conan_cmake_autodetect(settings) 21- conan_cmake_install( 22- PATH_OR_REFERENCE ${CMAKE_SOURCE_DIR} 23- INSTALL_FOLDER ${CMAKE_BINARY_DIR} 24- BUILD missing 25- REMOTE conancenter 26- SETTINGS ${settings} 27- ENV "CONAN_CMAKE_GENERATOR=${CMAKE_GENERATOR}" 28- CONF "tools.cmake.cmaketoolchain:generator=${CMAKE_GENERATOR}" 29- ) 30-endif() 31- 32 if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA) 33 include(CMakeLists.linux-x86_64.txt) 34 elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND HAVE_CUDA)