|
|
@@ -95,7 +95,7 @@ macro(_conan_check_system_name)
|
|
|
endif()
|
|
|
if(${CMAKE_SYSTEM_NAME} STREQUAL "QNX")
|
|
|
set(CONAN_SYSTEM_NAME Neutrino)
|
|
|
- endif()
|
|
|
+ endif()
|
|
|
set(CONAN_SUPPORTED_PLATFORMS Windows Linux Macos Android iOS FreeBSD WindowsStore WindowsCE watchOS tvOS FreeBSD SunOS AIX Arduino Emscripten Neutrino)
|
|
|
list (FIND CONAN_SUPPORTED_PLATFORMS "${CONAN_SYSTEM_NAME}" _index)
|
|
|
if (${_index} GREATER -1)
|
|
|
@@ -288,7 +288,7 @@ function(conan_cmake_settings result)
|
|
|
string(REGEX MATCH "[^=]*" MANUAL_SETTING "${ARG}")
|
|
|
message(STATUS "Conan: ${MANUAL_SETTING} was added as an argument. Not using the autodetected one.")
|
|
|
list(REMOVE_ITEM ARGUMENTS_PROFILE_AUTO "${MANUAL_SETTING}")
|
|
|
- endforeach()
|
|
|
+ endforeach()
|
|
|
|
|
|
# Automatic from CMake
|
|
|
foreach(ARG ${ARGUMENTS_PROFILE_AUTO})
|
|
|
@@ -407,7 +407,7 @@ function(conan_cmake_detect_vs_runtime result)
|
|
|
string(TOUPPER "${build_type}" build_type)
|
|
|
endif()
|
|
|
|
|
|
- if (DEFINED CMAKE_MSVC_RUNTIME_LIBRARY)
|
|
|
+ if (DEFINED CMAKE_MSVC_RUNTIME_LIBRARY)
|
|
|
if(${CMAKE_MSVC_RUNTIME_LIBRARY} STREQUAL MultiThreaded)
|
|
|
set(${result} "MT" PARENT_SCOPE)
|
|
|
elseif(${CMAKE_MSVC_RUNTIME_LIBRARY} STREQUAL MultiThreadedDebug)
|
|
|
@@ -649,12 +649,12 @@ function(conan_cmake_install)
|
|
|
set(NO_IMPORTS --no-imports)
|
|
|
endif()
|
|
|
set(install_args install ${PATH_OR_REFERENCE} ${REFERENCE} ${UPDATE} ${NO_IMPORTS} ${REMOTE} ${LOCKFILE} ${LOCKFILE_OUT} ${LOCKFILE_NODE_ID} ${INSTALL_FOLDER}
|
|
|
- ${GENERATOR} ${BUILD} ${ENV} ${ENV_HOST} ${ENV_BUILD} ${OPTIONS} ${OPTIONS_HOST} ${OPTIONS_BUILD}
|
|
|
+ ${GENERATOR} ${BUILD} ${ENV} ${ENV_HOST} ${ENV_BUILD} ${OPTIONS} ${OPTIONS_HOST} ${OPTIONS_BUILD}
|
|
|
${PROFILE} ${PROFILE_HOST} ${PROFILE_BUILD} ${SETTINGS} ${SETTINGS_HOST} ${SETTINGS_BUILD} ${CONF})
|
|
|
|
|
|
string(REPLACE ";" " " _install_args "${install_args}")
|
|
|
message(STATUS "Conan executing: ${CONAN_CMD} ${_install_args}")
|
|
|
-
|
|
|
+
|
|
|
if(ARGS_OUTPUT_QUIET)
|
|
|
set(OUTPUT_OPT OUTPUT_QUIET)
|
|
|
endif()
|
|
|
@@ -771,7 +771,7 @@ endmacro()
|
|
|
|
|
|
macro(conan_cmake_run)
|
|
|
conan_parse_arguments(${ARGV})
|
|
|
-
|
|
|
+
|
|
|
if(ARGUMENTS_CONFIGURATION_TYPES AND NOT CMAKE_CONFIGURATION_TYPES)
|
|
|
message(WARNING "CONFIGURATION_TYPES should only be specified for multi-configuration generators")
|
|
|
elseif(ARGUMENTS_CONFIGURATION_TYPES AND ARGUMENTS_BUILD_TYPE)
|
|
|
@@ -849,7 +849,7 @@ macro(conan_check)
|
|
|
if(NOT "${return_code}" STREQUAL "0")
|
|
|
message(FATAL_ERROR "Conan --version failed='${return_code}'")
|
|
|
endif()
|
|
|
-
|
|
|
+
|
|
|
if(NOT CONAN_DETECT_QUIET)
|
|
|
string(STRIP "${CONAN_VERSION_OUTPUT}" _CONAN_VERSION_OUTPUT)
|
|
|
message(STATUS "Conan: Version found ${_CONAN_VERSION_OUTPUT}")
|
akhropov