diff --git a/CMakeLists.txt b/CMakeLists.txt index 24ffd1225a..700adcc246 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,7 +39,6 @@ include(cmake/global_flags.cmake) include(cmake/global_vars.cmake) include(cmake/archive.cmake) include(cmake/common.cmake) -include(cmake/conan1_deprecated.cmake) include(cmake/cuda.cmake) include(cmake/cython.cmake) include(cmake/fbs.cmake) @@ -48,21 +47,6 @@ include(cmake/recursive_library.cmake) include(cmake/shared_libs.cmake) include(cmake/swig.cmake) -if (CMAKE_CROSSCOMPILING) - include(${PROJECT_BINARY_DIR}/conan_paths.cmake) -else() - conan_cmake_autodetect(settings) - conan_cmake_install( - PATH_OR_REFERENCE ${PROJECT_SOURCE_DIR} - INSTALL_FOLDER ${PROJECT_BINARY_DIR} - BUILD missing - REMOTE conancenter - SETTINGS ${settings} - ENV "CONAN_CMAKE_GENERATOR=${CMAKE_GENERATOR}" - CONF "tools.cmake.cmaketoolchain:generator=${CMAKE_GENERATOR}" - ) -endif() - if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA) include(CMakeLists.linux-x86_64.txt) @@ -93,4 +77,3 @@ elseif (ANDROID AND CMAKE_ANDROID_ARCH STREQUAL "x86") elseif (ANDROID AND CMAKE_ANDROID_ARCH STREQUAL "x86_64") include(CMakeLists.android-x86_64.txt) endif() -