Skip to content

Instantly share code, notes, and snippets.

Show Gist options
  • Save dalamber/ce92ec070daee77350e0b1a71d9ab97c to your computer and use it in GitHub Desktop.
Save dalamber/ce92ec070daee77350e0b1a71d9ab97c to your computer and use it in GitHub Desktop.
From f48f03c9e086ecb7a07aca056df513a196570f7a Mon Sep 17 00:00:00 2001
From: Anton Shpakovsky <anton.shpakovsky@gmail.com>
Date: Wed, 7 Jul 2021 17:59:45 +0700
Subject: [PATCH] Dependencies from conan must be lower-cased
---
BranchSDK/CMakeLists.txt | 4 ++--
conanfile.py | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/BranchSDK/CMakeLists.txt b/BranchSDK/CMakeLists.txt
index 0b7a0b6..549d2f0 100644
--- a/BranchSDK/CMakeLists.txt
+++ b/BranchSDK/CMakeLists.txt
@@ -37,7 +37,7 @@ add_library(BranchIO ${BRANCH_SOURCE})
target_include_directories(BranchIO PRIVATE ${CONAN_INCLUDE_DIRS})
# Link the shared lib against Conan deps (ignored when BUILD_SHARED_LIBS=false)
-target_link_libraries(BranchIO CONAN_PKG::Poco)
+target_link_libraries(BranchIO CONAN_PKG::poco)
# --------
# Settings
@@ -74,7 +74,7 @@ file(GLOB TEST ${CMAKE_CURRENT_SOURCE_DIR}/test/*.cpp)
# DLL. We could always build static, at least on Windows, even when building
# shared libraries, but for now it seems best to build against source.
add_executable(unit_tests ${TEST} ${BRANCH_SOURCE})
-target_link_libraries(unit_tests CONAN_PKG::Poco CONAN_PKG::OpenSSL CONAN_PKG::gtest)
+target_link_libraries(unit_tests CONAN_PKG::poco CONAN_PKG::openssl CONAN_PKG::gtest)
# Generates JUnit-style output in test_detail.xml, e.g. build/Debug/test_detail.xml.
add_test(NAME UnitTests COMMAND unit_tests --gtest_output=xml)
diff --git a/conanfile.py b/conanfile.py
index 3696cfb..356e2bd 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -42,8 +42,8 @@ class BranchioConan(ConanFile):
# Conan. Conan recently introduced lockfiles, which may be useful for this purpose
# as well. For now, this is consistent with transitive dependencies in Branch Maven
# packages, to avoid version drift.
- requires = "Poco/1.10.1@pocoproject/stable"
- build_requires = "gtest/1.8.1@bincrafters/stable"
+ requires = "poco/1.10.1@_/_"
+ build_requires = "gtest/1.8.1@_/_"
def validate(self):
if self.settings.os != "Windows":
--
2.22.0.windows.1
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment