conan: use cmake_paths generator instead of cmake

We also upgraded the xcode version on Travis-CI

.travis.yml

@@ -85,16 +85,16 @@ matrix:
         - BUILD_TYPE="Release"
         - WITH_SANITIZERS=1
 
-    - name: "macOS 10.14 - XCode 11.3 (Release)"
+    - name: "macOS 10.15.7 - XCode 12.2 (Release)"
       os: osx
-      osx_image: xcode11.3
+      osx_image: xcode12.2
       compiler: clang
       env:
         - BUILD_TYPE="Release"
 
-    - name: "macOS 10.14 - XCode 11.3 (Debug)"
+    - name: "macOS 10.15.7 - XCode 12.2 (Debug)"
       os: osx
-      osx_image: xcode11.3
+      osx_image: xcode12.2
       compiler: clang
       env:
         - BUILD_TYPE="Debug"

cmake/findDependencies.cmake

@@ -6,11 +6,8 @@ if (APPLE)
      set(CMAKE_FIND_FRAMEWORK NEVER)
 endif()
 
-# Check if the conan file exist to find the dependencies
+if (EXISTS ${CMAKE_BINARY_DIR}/conan_paths.cmake)
-if (EXISTS ${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
+    include(${CMAKE_BINARY_DIR}/conan_paths.cmake)
-    set(USING_CONAN ON)
-    include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
-    conan_basic_setup(NO_OUTPUT_DIRS KEEP_RPATHS TARGETS)
 endif()
 
 find_package(Threads REQUIRED)

conanfile.py

@@ -4,7 +4,7 @@ from conans.model.version import Version
 
 class Exiv2Conan(ConanFile):
     settings = 'os', 'compiler', 'build_type', 'arch'
-    generators = 'cmake'
+    generators = 'cmake_paths'
     options = {'unitTests': [True, False],
                'xmp': [True, False],
                'iconv': [True, False],

samples/CMakeLists.txt

@@ -102,13 +102,6 @@ if (EXIV2_ENABLE_WEBREADY)
     if( EXIV2_ENABLE_CURL )
         target_include_directories(conntest SYSTEM PRIVATE ${CURL_INCLUDE_DIR} )
         target_link_libraries(conntest PRIVATE ${CURL_LIBRARIES})
-        if (USING_CONAN)
-            target_compile_definitions(conntest PRIVATE ${CONAN_COMPILE_DEFINITIONS_LIBCURL})
-            target_link_libraries(conntest PRIVATE ${CONAN_EXE_LINKER_FLAGS_LIBCURL})
-            if ( MSVC ) 
-			    target_link_libraries(conntest PRIVATE Crypt32 Ws2_32 ${CURL_LIBRARIES})
-            endif()
-        endif()
     endif()
 endif()
 

src/CMakeLists.txt

@@ -163,13 +163,6 @@ if (EXIV2_ENABLE_WEBREADY)
     if( EXIV2_ENABLE_CURL )
         target_include_directories(exiv2lib SYSTEM PRIVATE ${CURL_INCLUDE_DIR} )
         target_link_libraries(exiv2lib PRIVATE ${CURL_LIBRARIES})
-        if (USING_CONAN)
-            target_compile_definitions(exiv2lib PRIVATE ${CONAN_COMPILE_DEFINITIONS_LIBCURL})
-            target_link_libraries(exiv2lib PRIVATE ${CONAN_EXE_LINKER_FLAGS_LIBCURL})
-            if ( MSVC ) 
-                target_link_libraries(exiv2lib PRIVATE Crypt32)
-            endif()
-        endif()
     endif()
 
 endif()