From 7ee8e2339b9b1e8eca2bee803386346be36f9f87 Mon Sep 17 00:00:00 2001 From: Daniel Saier Date: Fri, 6 May 2022 16:21:00 +0200 Subject: [PATCH] Restore detection of target OS This was broken in 61ae3b3356f2f2c6ca2a3dd0fedcc21a407bbe1c. The variable is getting set correctly, but it was never added to the actual settings. --- conan.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conan.cmake b/conan.cmake index 33512fce..59ac49dd 100644 --- a/conan.cmake +++ b/conan.cmake @@ -305,7 +305,7 @@ function(conan_cmake_settings result) if(NOT _SETTINGS OR ARGUMENTS_PROFILE_AUTO STREQUAL "ALL") set(ARGUMENTS_PROFILE_AUTO arch build_type compiler compiler.version - compiler.runtime compiler.libcxx compiler.toolset) + compiler.runtime compiler.libcxx compiler.toolset os) endif() # remove any manually specified settings from the autodetected settings @@ -454,7 +454,7 @@ endfunction() function(_collect_settings result) set(ARGUMENTS_PROFILE_AUTO arch build_type compiler compiler.version compiler.runtime compiler.libcxx compiler.toolset - compiler.cppstd) + compiler.cppstd os) foreach(ARG ${ARGUMENTS_PROFILE_AUTO}) string(TOUPPER ${ARG} _arg_name) string(REPLACE "." "_" _arg_name ${_arg_name})