-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
(#17125) aws-sdk-cpp: conan v2 support
* conan v2 support * use rm_safe to delete s3-crt option * use cache_variables * use preprocessor_definitions * aws-c-event-stream is always a direct dependency * disable warnings as errors * aws-checksums is a direct dependency * restore compatible versions of dependencies * restore cmake_minimum_required to satisfy stupid hook * fix build_modules * fix requires in package_info() * fix pulseaudio detection * Add missing transitive headers, fix cmake modules * use version range for openssl * bump libcurl * add version range for libcurl --------- Co-authored-by: Luis Caro Campos <3535649+jcar87@users.noreply.github.com>
- Loading branch information
Showing
9 changed files
with
171 additions
and
142 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
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
Large diffs are not rendered by default.
Oops, something went wrong.
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 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,10 @@ | ||
| cmake_minimum_required(VERSION 3.1) | ||
| project(test_package CXX) | ||
|
|
||
| include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) | ||
| conan_basic_setup(TARGETS) | ||
| cmake_minimum_required(VERSION 3.8) | ||
| project(test_package LANGUAGES CXX) | ||
|
|
||
| find_package(AWSSDK REQUIRED CONFIG) | ||
|
|
||
| add_subdirectory(aws-sdk-cpp-plugin) | ||
|
|
||
| add_executable(${PROJECT_NAME} test_package.cpp) | ||
| target_link_libraries(${PROJECT_NAME} aws-sdk-cpp-plugin) | ||
| set_target_properties(${PROJECT_NAME} PROPERTIES CXX_STANDARD 11) | ||
| target_link_libraries(${PROJECT_NAME} PRIVATE aws-sdk-cpp-plugin) | ||
| target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_11) |
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 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,26 @@ | ||
| from conans import ConanFile, CMake, tools | ||
| from conan import ConanFile | ||
| from conan.tools.build import can_run | ||
| from conan.tools.cmake import cmake_layout, CMake | ||
| import os | ||
|
|
||
|
|
||
| class TestPackageConan(ConanFile): | ||
| settings = "os", "arch", "compiler", "build_type" | ||
| generators = "cmake", "cmake_find_package_multi" | ||
| generators = "CMakeDeps", "CMakeToolchain", "VirtualRunEnv" | ||
| test_type = "explicit" | ||
|
|
||
| def layout(self): | ||
| cmake_layout(self) | ||
|
|
||
| def requirements(self): | ||
| self.requires(self.tested_reference_str) | ||
|
|
||
| def build(self): | ||
| cmake = CMake(self) | ||
| cmake.configure() | ||
| cmake.build() | ||
|
|
||
| def test(self): | ||
| if not tools.cross_building(self): | ||
| bin_path = os.path.join("bin", "test_package") | ||
| self.run(bin_path, run_environment=True) | ||
| if can_run(self): | ||
| bin_path = os.path.join(self.cpp.build.bindirs[0], "test_package") | ||
| self.run(bin_path, env="conanrun") |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| 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) |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| from conans import ConanFile, CMake, tools | ||
| import os | ||
|
|
||
|
|
||
| class TestPackageConan(ConanFile): | ||
| settings = "os", "arch", "compiler", "build_type" | ||
| generators = "cmake", "cmake_find_package_multi" | ||
|
|
||
| def build(self): | ||
| cmake = CMake(self) | ||
| cmake.configure() | ||
| cmake.build() | ||
|
|
||
| def test(self): | ||
| if not tools.cross_building(self): | ||
| bin_path = os.path.join("bin", "test_package") | ||
| self.run(bin_path, run_environment=True) |