conan - change generator to be able to use latest expat version

cmake/findDependencies.cmake

@@ -1,5 +1,6 @@
-# set include path for FindXXX.cmake files
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/")
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_BINARY_DIR})
+list(APPEND CMAKE_PREFIX_PATH ${CMAKE_BINARY_DIR})
 
 find_package (Python3 COMPONENTS Interpreter REQUIRED)
 
@@ -8,9 +9,6 @@ if (APPLE)
      set(CMAKE_FIND_FRAMEWORK NEVER)
 endif()
 
-if (EXISTS ${CMAKE_BINARY_DIR}/conan_paths.cmake)
-    include(${CMAKE_BINARY_DIR}/conan_paths.cmake)
-endif()
 
 find_package(Threads REQUIRED)
 

conanfile.py

@@ -4,7 +4,7 @@
 
 class Exiv2Conan(ConanFile):
     settings = 'os', 'compiler', 'build_type', 'arch'
-    generators = 'cmake_paths'
+    generators = 'cmake_find_package'
     options = {'unitTests': [True, False],
                'xmp': [True, False],
                'iconv': [True, False],
@@ -35,10 +35,7 @@ def requirements(self):
         if self.options.xmp:
             self.requires('XmpSdk/2016.7@piponazo/stable') # from conan-piponazo
         else:
-            if os_info.is_windows:
-                self.requires('Expat/2.2.6@pix4d/stable')
-            else:
-                self.requires('expat/2.3.0')
+            self.requires('expat/2.3.0')
 
     def imports(self):
         self.copy('*.dll', dst='bin', src='bin')

unitTests/CMakeLists.txt

@@ -29,8 +29,8 @@ target_compile_definitions(unit_tests
 target_link_libraries(unit_tests
     PRIVATE
         exiv2lib
-        GTest::GTest
-        GTest::Main
+        GTest::gtest
+        GTest::gtest_main
 )
 
 # ZLIB is used in exiv2lib_int.
@@ -47,8 +47,4 @@ set_target_properties(unit_tests PROPERTIES
     COMPILE_FLAGS ${EXTRA_COMPILE_FLAGS}
 )
 
-if (MSVC)
-    set_target_properties(unit_tests PROPERTIES LINK_FLAGS "/ignore:4099")
-endif()
-
 add_test(NAME unit_tests COMMAND unit_tests)

xmpsdk/CMakeLists.txt

@@ -28,13 +28,12 @@ add_library(exiv2-xmp STATIC
 
 target_link_libraries(exiv2-xmp
     PRIVATE 
-        $<BUILD_INTERFACE:${EXPAT_LIBRARY}>
+    EXPAT::EXPAT
 )
 
 target_include_directories(exiv2-xmp SYSTEM
     PRIVATE 
         ${PROJECT_SOURCE_DIR}/xmpsdk/include
-        ${EXPAT_INCLUDE_DIR}
 )
 
 # Prevent a denial-service-attack related to XML entity expansion