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

improve conan generator choice #433

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
+14 −2
Open

improve conan generator choice #433

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 14 additions & 2 deletions conan.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,9 +467,21 @@ function(old_conan_cmake_install)
conan_parse_arguments(${ARGV})

if(CONAN_CMAKE_MULTI)
set(ARGUMENTS_GENERATORS ${ARGUMENTS_GENERATORS} cmake_multi)
if(NOT cmake_multi IN_LIST ARGUMENTS_GENERATORS)
set(ARGUMENTS_GENERATORS ${ARGUMENTS_GENERATORS} cmake_multi)
endif()
if(cmake_find_package IN_LIST ARGUMENTS_GENERATORS
AND NOT cmake_find_package_multi IN_LIST ARGUMENTS_GENERATORS)
set(ARGUMENTS_GENERATORS ${ARGUMENTS_GENERATORS} cmake_find_package_multi)
endif()
else()
set(ARGUMENTS_GENERATORS ${ARGUMENTS_GENERATORS} cmake)
if(NOT cmake IN_LIST ARGUMENTS_GENERATORS)
set(ARGUMENTS_GENERATORS ${ARGUMENTS_GENERATORS} cmake)
endif()
if(cmake_find_package_multi IN_LIST ARGUMENTS_GENERATORS
AND NOT cmake_find_package IN_LIST ARGUMENTS_GENERATORS)
set(ARGUMENTS_GENERATORS ${ARGUMENTS_GENERATORS} cmake_find_package)
endif()
endif()

set(CONAN_BUILD_POLICY "")
Expand Down