Skip to content

Commit

Permalink
Restore detection of target OS
Browse files Browse the repository at this point in the history
This was broken in 61ae3b3. The
variable is getting set correctly, but it was never added to the actual
settings.
  • Loading branch information
saierd authored and tkhyn committed Sep 28, 2023
1 parent 73734d0 commit 7ee8e23
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions conan.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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})
Expand Down

0 comments on commit 7ee8e23

Please sign in to comment.