Fix patches for 1.3.0

conan-io · Apr 26, 2024 · d77e120 · d77e120
1 parent fc875ab
commit d77e120
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/recipes/dispenso/all/conanfile.py b/recipes/dispenso/all/conanfile.py
@@ -3,7 +3,6 @@
 from conan.tools.build import check_min_cppstd
 from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout
 from conan.tools.files import copy, get, export_conandata_patches, apply_conandata_patches, rm, rmdir
-from conan.tools.microsoft import is_msvc
 from conan.tools.scm import Version
 import os
 
@@ -105,7 +104,7 @@ def package(self):
     def package_info(self):
         self.cpp_info.libs = ["dispenso"]
 
-        self.cpp_info.set_property("cmake_file_name", "dispenso")
+        self.cpp_info.set_property("cmake_file_name", "Dispenso")
         self.cpp_info.set_property("cmake_target_name", "Dispenso::dispenso")
 
         if self.settings.os in ["Linux", "FreeBSD"]:

diff --git a/recipes/dispenso/all/patches/1.3.0-001-unvendorize-concurrentqueue.patch b/recipes/dispenso/all/patches/1.3.0-001-unvendorize-concurrentqueue.patch
@@ -1,8 +1,21 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7af1b8a..05c86a6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -48,8 +48,6 @@ elseif (THREAD_SANITIZER)
+   add_link_options(-fsanitize=thread)
+ endif()
+
+-set(CMAKE_CXX_STANDARD 14 CACHE STRING "the C++ standard to use for this project")
+-
+ ###########################################################
+ # Targets
+ add_subdirectory(dispenso)
 diff --git a/dispenso/CMakeLists.txt b/dispenso/CMakeLists.txt
-index e318529..62641e4 100644
+index 24a8c48..9231949 100644
 --- a/dispenso/CMakeLists.txt
 +++ b/dispenso/CMakeLists.txt
-@@ -28,16 +28,15 @@ target_compile_options(dispenso PRIVATE
+@@ -33,16 +33,15 @@ endif()
  target_include_directories(dispenso
  PUBLIC
    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/..>
@@ -19,5 +32,5 @@ index e318529..62641e4 100644
 +find_package(concurrentqueue REQUIRED)
 +target_link_libraries(dispenso PUBLIC Threads::Threads concurrentqueue::concurrentqueue)
 
- if(WIN32)
-   target_link_libraries(dispenso PUBLIC Synchronization)
+ check_cxx_source_compiles("
+ #include <atomic>
diff --git a/recipes/dispenso/all/test_package/CMakeLists.txt b/recipes/dispenso/all/test_package/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.15)
 
 project(test_package LANGUAGES CXX)
 
-find_package(dispenso REQUIRED CONFIG)
+find_package(Dispenso REQUIRED CONFIG)
 
 add_executable(${PROJECT_NAME} test_package.cpp)
 # don't link to ${CONAN_LIBS} or CONAN_PKG::package