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

Add --conf arguments for conan install command. #445

Merged
merged 5 commits into from
Oct 26, 2022
Merged

Add --conf arguments for conan install command. #445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
61316c5
Add --conf arguments for conan install cmd.
hwhsu1231 Sep 17, 2022
5eeea15
Fix the wrong letter-case.
hwhsu1231 Sep 17, 2022
15f3f7a
Follow the convention of indentation.
hwhsu1231 Sep 17, 2022
c889099
Merge branch 'develop' of github.com:conan-io/cmake-conan into add-co…
czoido Oct 26, 2022
b5189ec
add test
czoido Oct 26, 2022
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
17 changes: 13 additions & 4 deletions conan.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,7 @@ function(conan_cmake_install)
set(installOptions UPDATE NO_IMPORTS OUTPUT_QUIET ERROR_QUIET)
set(installOneValueArgs PATH_OR_REFERENCE REFERENCE REMOTE LOCKFILE LOCKFILE_OUT LOCKFILE_NODE_ID INSTALL_FOLDER OUTPUT_FOLDER)
set(installMultiValueArgs GENERATOR BUILD ENV ENV_HOST ENV_BUILD OPTIONS_HOST OPTIONS OPTIONS_BUILD PROFILE
PROFILE_HOST PROFILE_BUILD SETTINGS SETTINGS_HOST SETTINGS_BUILD)
PROFILE_HOST PROFILE_BUILD SETTINGS SETTINGS_HOST SETTINGS_BUILD CONF CONF_HOST CONF_BUILD)
cmake_parse_arguments(ARGS "${installOptions}" "${installOneValueArgs}" "${installMultiValueArgs}" ${ARGN})
foreach(arg ${installOptions})
if(ARGS_${arg})
Expand Down Expand Up @@ -611,6 +611,12 @@ function(conan_cmake_install)
set(flag "--settings:host")
elseif("${arg}" STREQUAL "SETTINGS_BUILD")
set(flag "--settings:build")
elseif("${arg}" STREQUAL "CONF")
set(flag "--conf")
elseif("${arg}" STREQUAL "CONF_HOST")
set(flag "--conf:host")
elseif("${arg}" STREQUAL "CONF_BUILD")
set(flag "--conf:build")
endif()
list(LENGTH ARGS_${arg} numargs)
foreach(item ${ARGS_${arg}})
Expand All @@ -628,9 +634,12 @@ function(conan_cmake_install)
if(DEFINED NO_IMPORTS)
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} ${OUTPUT_FOLDER}
${GENERATOR} ${BUILD} ${ENV} ${ENV_HOST} ${ENV_BUILD} ${OPTIONS} ${OPTIONS_HOST} ${OPTIONS_BUILD}
${PROFILE} ${PROFILE_HOST} ${PROFILE_BUILD} ${SETTINGS} ${SETTINGS_HOST} ${SETTINGS_BUILD})
set(install_args install ${PATH_OR_REFERENCE} ${REFERENCE} ${UPDATE} ${NO_IMPORTS} ${REMOTE}
${LOCKFILE} ${LOCKFILE_OUT} ${LOCKFILE_NODE_ID} ${INSTALL_FOLDER}
${OUTPUT_FOLDER} ${GENERATOR} ${BUILD} ${ENV} ${ENV_HOST} ${ENV_BUILD}
${OPTIONS} ${OPTIONS_HOST} ${OPTIONS_BUILD} ${PROFILE} ${PROFILE_HOST}
${PROFILE_BUILD} ${SETTINGS} ${SETTINGS_HOST} ${SETTINGS_BUILD}
${CONF} ${CONF_HOST} ${CONF_BUILD})

string(REPLACE ";" " " _install_args "${install_args}")
message(STATUS "Conan executing: ${CONAN_CMD} ${_install_args}")
Expand Down
22 changes: 22 additions & 0 deletions tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,28 @@ def test_conan_cmake_install_args(self):
run("cmake .. {} -DCMAKE_BUILD_TYPE=Release".format(generator))
run("cmake --build . --config Release")

def test_conan_cmake_install_conf_args(self):
content = textwrap.dedent("""
cmake_minimum_required(VERSION 3.9)
project(FormatOutput CXX)
include(conan.cmake)
conan_cmake_configure(REQUIRES "")
conan_cmake_autodetect(settings)
conan_cmake_install(PATH_OR_REFERENCE .
GENERATOR cmake
REMOTE conancenter
CONF user.configuration:myconfig=somevalue
SETTINGS ${settings})
""")
save("CMakeLists.txt", content)
os.makedirs("build")
os.chdir("build")
run("cmake .. {} -DCMAKE_BUILD_TYPE=Release > output.txt".format(generator))
with open('output.txt', 'r') as file:
data = file.read()
assert "--conf user.configuration:myconfig=somevalue" in data


def test_conan_cmake_install_outputfolder(self):
content = textwrap.dedent("""
cmake_minimum_required(VERSION 3.15)
Expand Down