646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
40 lines
1.3 KiB
Diff
40 lines
1.3 KiB
Diff
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()
|
|
-
|