tjh.dev
1diff --git a/CMakeLists.txt b/CMakeLists.txt
2index 24ffd1225a..700adcc246 100644
3--- a/CMakeLists.txt
4+++ b/CMakeLists.txt
5@@ -39,7 +39,6 @@ include(cmake/global_flags.cmake)
6 include(cmake/global_vars.cmake)
7 include(cmake/archive.cmake)
8 include(cmake/common.cmake)
9-include(cmake/conan1_deprecated.cmake)
10 include(cmake/cuda.cmake)
11 include(cmake/cython.cmake)
12 include(cmake/fbs.cmake)
13@@ -48,21 +47,6 @@ include(cmake/recursive_library.cmake)
14 include(cmake/shared_libs.cmake)
15 include(cmake/swig.cmake)
16
17-if (CMAKE_CROSSCOMPILING)
18- include(${PROJECT_BINARY_DIR}/conan_paths.cmake)
19-else()
20- conan_cmake_autodetect(settings)
21- conan_cmake_install(
22- PATH_OR_REFERENCE ${PROJECT_SOURCE_DIR}
23- INSTALL_FOLDER ${PROJECT_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
33 if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA)
34 include(CMakeLists.linux-x86_64.txt)
35@@ -93,4 +77,3 @@ elseif (ANDROID AND CMAKE_ANDROID_ARCH STREQUAL "x86")
36 elseif (ANDROID AND CMAKE_ANDROID_ARCH STREQUAL "x86_64")
37 include(CMakeLists.android-x86_64.txt)
38 endif()
39-