diff --git a/CMakeLists.txt b/CMakeLists.txt index 86728e04b..184cd1f2a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,26 +3,11 @@ cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR) set(PROJECT AmneziaVPN) set(AMNEZIAVPN_VERSION 4.8.13.1) -include(cmake/conan_bootstrap.cmake) -set(CMAKE_PROJECT_TOP_LEVEL_INCLUDES ${CMAKE_SOURCE_DIR}/cmake/conan_provider.cmake CACHE STRING "" FORCE) - -if(APPLE) - get_property(generator_is_multi_config GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) - if (generator_is_multi_config) - set(CONAN_INSTALL_BUILD_CONFIGURATIONS Release Debug MinSizeRel RelWithDebInfo) - endif() - if(CMAKE_SYSTEM_NAME STREQUAL "iOS") - set(CMAKE_OSX_DEPLOYMENT_TARGET "14.0" CACHE STRING "" FORCE) - set(CMAKE_OSX_ARCHITECTURES "arm64" CACHE STRING "" FORCE) - elseif(MACOS_NE) - set(CONAN_INSTALL_ARGS "--build=missing;-o=&:macos_ne=True" CACHE STRING "" FORCE) - set(CMAKE_OSX_DEPLOYMENT_TARGET "13.0" CACHE STRING "" FORCE) - set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "" FORCE) - else() - set(CMAKE_OSX_DEPLOYMENT_TARGET "13.0" CACHE STRING "" FORCE) - set(CMAKE_OSX_ARCHITECTURES "x86_64" CACHE STRING "" FORCE) - endif() -endif() +set(CMAKE_PROJECT_TOP_LEVEL_INCLUDES + ${CMAKE_SOURCE_DIR}/cmake/platform_settings.cmake + ${CMAKE_SOURCE_DIR}/cmake/recipes_bootstrap.cmake + ${CMAKE_SOURCE_DIR}/cmake/conan_provider.cmake + CACHE STRING "" FORCE) project(${PROJECT} VERSION ${AMNEZIAVPN_VERSION} DESCRIPTION "AmneziaVPN" diff --git a/cmake/platform_settings.cmake b/cmake/platform_settings.cmake new file mode 100644 index 000000000..68d894788 --- /dev/null +++ b/cmake/platform_settings.cmake @@ -0,0 +1,17 @@ +if(APPLE) + get_property(generator_is_multi_config GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) + if (generator_is_multi_config) + set(CONAN_INSTALL_BUILD_CONFIGURATIONS Release Debug MinSizeRel RelWithDebInfo) + endif() + if(CMAKE_SYSTEM_NAME STREQUAL "iOS") + set(CMAKE_OSX_DEPLOYMENT_TARGET "14.0" CACHE STRING "" FORCE) + set(CMAKE_OSX_ARCHITECTURES "arm64" CACHE STRING "" FORCE) + elseif(MACOS_NE) + set(CONAN_INSTALL_ARGS "--build=missing;-o=&:macos_ne=True" CACHE STRING "" FORCE) + set(CMAKE_OSX_DEPLOYMENT_TARGET "13.0" CACHE STRING "" FORCE) + set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "" FORCE) + else() + set(CMAKE_OSX_DEPLOYMENT_TARGET "13.0" CACHE STRING "" FORCE) + set(CMAKE_OSX_ARCHITECTURES "x86_64" CACHE STRING "" FORCE) + endif() +endif() \ No newline at end of file diff --git a/cmake/conan_bootstrap.cmake b/cmake/recipes_bootstrap.cmake similarity index 100% rename from cmake/conan_bootstrap.cmake rename to cmake/recipes_bootstrap.cmake