ruy: update to support Conan 2.0 #16688
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
SpaceIm
suggested changes
Mar 31, 2023
|
|
||
| class TestPackageConan(ConanFile): | ||
| settings = "os", "compiler", "build_type", "arch" | ||
| generators = "cmake", "cmake_find_package" |
There was a problem hiding this comment.
Suggested change
| generators = "cmake", "cmake_find_package" | |
| generators = "cmake", "cmake_find_package_multi" |
Comment on lines
+1
to
+11
| cmake_minimum_required(VERSION 3.1) | ||
| project(test_package CXX) | ||
|
|
||
| include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) | ||
| conan_basic_setup(TARGETS) | ||
|
|
||
| find_package(ruy REQUIRED) | ||
|
|
||
| add_executable(${PROJECT_NAME} test_package.cpp) | ||
| target_link_libraries(${PROJECT_NAME} ruy::ruy) | ||
| set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 11) |
There was a problem hiding this comment.
Suggested change
| cmake_minimum_required(VERSION 3.1) | |
| project(test_package CXX) | |
| include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) | |
| conan_basic_setup(TARGETS) | |
| find_package(ruy REQUIRED) | |
| add_executable(${PROJECT_NAME} test_package.cpp) | |
| target_link_libraries(${PROJECT_NAME} ruy::ruy) | |
| set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 11) | |
| cmake_minimum_required(VERSION 3.1) | |
| project(test_package) | |
| include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) | |
| conan_basic_setup(TARGETS) | |
| add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../test_package | |
| ${CMAKE_CURRENT_BINARY_DIR}/test_package) |
| @@ -0,0 +1,27 @@ | |||
| #include <cstdint> | |||
czoido
previously approved these changes
Apr 11, 2023
Co-authored-by: SpaceIm <30052553+SpaceIm@users.noreply.github.com>
Co-authored-by: SpaceIm <30052553+SpaceIm@users.noreply.github.com>
Co-authored-by: SpaceIm <30052553+SpaceIm@users.noreply.github.com>
Co-authored-by: SpaceIm <30052553+SpaceIm@users.noreply.github.com>
Co-authored-by: SpaceIm <30052553+SpaceIm@users.noreply.github.com>
czoido
approved these changes
Apr 12, 2023
Conan v1 pipeline ✔️All green in build 11 (
Conan v2 pipeline (informative, not required for merge) ✔️
All green in build 13 (
|
AbrilRBS
approved these changes
Apr 12, 2023
MartinDelille
pushed a commit
to MartinDelille/conan-center-index
that referenced
this pull request
Apr 12, 2023
* ruy: update to support Conan 2.0 * ruy: fixes * ruy: remove cmake generated files * ruy: remove old version * ruy: fix test_package when cppstd is not defined in the profile (conan 1.x) * ruy: fix order of cmake_minimum_required invocation * ruy: export all symbols on windows to support shared * Update recipes/ruy/all/conanfile.py Co-authored-by: SpaceIm <30052553+SpaceIm@users.noreply.github.com> * Update recipes/ruy/all/test_package/conanfile.py Co-authored-by: SpaceIm <30052553+SpaceIm@users.noreply.github.com> * Update recipes/ruy/all/test_package/conanfile.py Co-authored-by: SpaceIm <30052553+SpaceIm@users.noreply.github.com> * Update recipes/ruy/all/test_package/CMakeLists.txt Co-authored-by: SpaceIm <30052553+SpaceIm@users.noreply.github.com> * Update recipes/ruy/all/test_package/CMakeLists.txt Co-authored-by: SpaceIm <30052553+SpaceIm@users.noreply.github.com> --------- Co-authored-by: SpaceIm <30052553+SpaceIm@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Specify library name and version: ruy/all
Changes in this PR:
cmake_minimum_required()is the first thing called in the project - this is an upstream issue which has been reported: cmake_minimum_required is called after project() google/ruy#328