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

dep provider: fixes #476

Merged
merged 1 commit into from
Mar 13, 2023
Merged

dep provider: fixes #476

Show file tree
Hide file tree
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
14 changes: 13 additions & 1 deletion conantools.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,14 @@ function(detect_compiler COMPILER COMPILER_VERSION)
set(_COMPILER "apple-clang")
string(REPLACE "." ";" VERSION_LIST ${CMAKE_CXX_COMPILER_VERSION})
list(GET VERSION_LIST 0 _COMPILER_VERSION)
elseif(_COMPILER MATCHES Clang)
set(_COMPILER "clang")
string(REPLACE "." ";" VERSION_LIST ${CMAKE_CXX_COMPILER_VERSION})
list(GET VERSION_LIST 0 _COMPILER_VERSION)
elseif(_COMPILER MATCHES GNU)
set(_COMPILER "gcc")
string(REPLACE "." ";" VERSION_LIST ${CMAKE_CXX_COMPILER_VERSION})
list(GET VERSION_LIST 0 _COMPILER_VERSION)
endif()

message(STATUS "Conan-cmake: [settings] compiler=${_COMPILER}")
Expand Down Expand Up @@ -91,6 +99,10 @@ function(detect_host_profile output_file)
else()
set(_FN ${output_file})
endif()

string(APPEND PROFILE "[conf]\n")
string(APPEND PROFILE "tools.cmake.cmaketoolchain:generator=${CMAKE_GENERATOR}\n")
Copy link
Member

Choose a reason for hiding this comment

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

Is CMAKE_GENERATOR always defined as a variable? Even when not provided in CLI and defaulted?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yup, should be defined by CMake itself, even when not provided by the user


message(STATUS "Conan-cmake: Creating profile ${_FN}")
file(WRITE ${_FN} ${PROFILE})
message(STATUS "Conan-cmake: Profile: \n${PROFILE}")
Expand Down Expand Up @@ -128,7 +140,7 @@ function(conan_provide_dependency package_name)
if(NOT CONAN_INSTALL_SUCCESS)
message(STATUS "CMake-conan: first find_package() found, running 'conan install' to install deps")
detect_host_profile(${CMAKE_BINARY_DIR}/conan_host_profile)
if(CMAKE_BUILD_TYPE)
if(NOT CMAKE_CONFIGURATION_TYPES)
Copy link
Member

Choose a reason for hiding this comment

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

I was relying on the fact that users in Windows can still force installing just 1 configuration with -DCMAKE_BUILD_TYPE=Debug, even if that does nothing, Conan will know to install only the Debug.

If we are not allowing this, we would need another kind of opt-out I guess?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yup, we would need some opt-out indeed! I would try to avoid giving CMAKE_BUILD_TYPE a meaning in the context of a multi-config generator (where giving CMAKE_BUILD_TYPE a value at configure time is unfortunately allowed, but will have no effect).

message(STATUS "CMake-conan: Intalling single configuration ${CMAKE_BUILD_TYPE}")
conan_install(-pr ${CMAKE_BINARY_DIR}/conan_host_profile --build=missing -g CMakeDeps)
else()
Expand Down
14 changes: 11 additions & 3 deletions tests_new.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,16 +85,24 @@ def test1():
shutil.copy2(os.path.join(os.path.dirname(__file__), "conan_provider.cmake"), ".")
shutil.copy2(os.path.join(os.path.dirname(__file__), "conaninstall.cmake"), ".")
shutil.copy2(os.path.join(os.path.dirname(__file__), "conantools.cmake"), ".")
with chdir("build"):
if platform.system() == "Windows":

if platform.system() == "Windows":
with chdir("build"):
run("cmake .. -DCMAKE_PROJECT_TOP_LEVEL_INCLUDES=conan_provider.cmake")
run("cmake --build . --config Release")
run("cmake --build . --config Debug")
run(r"Release\app.exe")
run(r"Debug\app.exe")
else:
else:
with chdir("build"):
run("cmake .. -DCMAKE_PROJECT_TOP_LEVEL_INCLUDES=conan_provider.cmake -DCMAKE_BUILD_TYPE=Release")
run("cmake --build .")
run("./app")
with chdir("build-multi"):
run("cmake .. -DCMAKE_PROJECT_TOP_LEVEL_INCLUDES=conan_provider.cmake -G'Ninja Multi-Config'")
run("cmake --build . --config Release")
run("cmake --build . --config Debug")
run("./Release/app")
run("./Debug/app")