diff --git a/CMakeLists.txt b/CMakeLists.txt index f2ca9a030ee5..b08b254110a2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,17 +23,14 @@ string(REPLACE "armeabi-v7a" "armv7" ARCH "${ARCH}") string(REPLACE "arm64-v8a" "armv8" ARCH "${ARCH}") include(${CMAKE_CURRENT_LIST_DIR}/app/conan.cmake) -conan_cmake_configure(GENERATORS cmake) -conan_cmake_autodetect(settings_build) conan_cmake_autodetect(settings_host ARCH ${ARCH}) # inspired from here https://docs.conan.io/en/latest/integrations/cross_platform/android.html configure_file(app/toolchain.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/toolchain.cmake @ONLY) conan_cmake_install(PATH_OR_REFERENCE ${CMAKE_CURRENT_LIST_DIR} BUILD missing - SETTINGS_BUILD ${settings_build} compiler.libcxx=libc++ SETTINGS_HOST ${settings_host} compiler.libcxx=c++_shared - PROFILE_BUILD default - PROFILE_HOST ${CMAKE_CURRENT_LIST_DIR}/conanprofile.txt + PROFILE_BUILD ${CMAKE_CURRENT_LIST_DIR}/conanprofile_build.txt + PROFILE_HOST ${CMAKE_CURRENT_LIST_DIR}/conanprofile_host.txt ENV CONAN_CMAKE_TOOLCHAIN_FILE=${CMAKE_CURRENT_BINARY_DIR}/toolchain.cmake ANDROID_NDK_ROOT=${CMAKE_ANDROID_NDK}) include(${CMAKE_CURRENT_BINARY_DIR}/conan_paths.cmake) diff --git a/conanprofile_build.txt b/conanprofile_build.txt new file mode 100644 index 000000000000..7d80aa8d7384 --- /dev/null +++ b/conanprofile_build.txt @@ -0,0 +1,13 @@ +include(default) + +[settings] +compiler=clang +compiler.libcxx=libc++ +build_type=Release + +[env] +CONAN_RUN_TESTS=False +CONAN_CMAKE_GENERATOR=Ninja + +[conf] +tools.build:skip_test=True diff --git a/conanprofile.txt b/conanprofile_host.txt similarity index 100% rename from conanprofile.txt rename to conanprofile_host.txt