Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove manually specified settings from auto list #258

Merged
merged 7 commits into from
Sep 3, 2020
Merged

Remove manually specified settings from auto list #258

Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3df8d20
remove manually specified settings from auto list
czoido Jun 30, 2020
1f62727
use appveyor cmake
czoido Jul 2, 2020
238b2a2
Update appveyor.yml
czoido Jul 3, 2020
1fe7244
use cmake installer again
czoido Jul 7, 2020
2d9b27a
add test
czoido Sep 3, 2020
7b95e5a
fix test
czoido Sep 3, 2020
f7523f4
minor changes
czoido Sep 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions conan.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,13 @@ function(conan_cmake_settings result)
compiler.runtime compiler.libcxx compiler.toolset)
endif()

# remove any manually specified settings from the autodetected settings
foreach(ARG ${ARGUMENTS_SETTINGS})
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A test would be great.

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()

# Automatic from CMake
foreach(ARG ${ARGUMENTS_PROFILE_AUTO})
string(TOUPPER ${ARG} _arg_name)
Expand Down