CMakeLists.txt

@@ -394,9 +394,9 @@ if(ENABLE_LIBYUV)
 	endif()
 endif()
 if(ENABLE_QRCODE)
-	find_package(Zxing)
+	find_package(ZXing)
 	if(NOT ZXING_FOUND)
-		message(WARNING "Could not find Zxing, mediastreamer2 will be compiled without Zxing(QRCode)")
+		message(WARNING "Could not find ZXing, mediastreamer2 will be compiled without ZXing(QRCode)")
 		set(ENABLE_QRCODE OFF CACHE BOOL "Enable QRCode support" FORCE)
 	else()
 		add_definitions(-DQRCODE_ENABLED)

cmake/FindZxing.cmake → cmake/FindZXing.cmake

@@ -28,13 +28,21 @@
 
 find_path(ZXING_INCLUDE_DIRS
 	NAMES
+		ZXing/BarcodeFormat.h
+		ZXing/BitHacks.h
+		ZXing/ByteArray.h
+		ZXing/CharacterSet.h
+		ZXing/Flags.h
+		ZXing/GTIN.h
+		ZXing/TextUtfEncoding.h
+		ZXing/ZXAlgorithms.h
 		ZXing/ZXConfig.h
 	PATH_SUFFIXES include
 )
 
 find_library(ZXING_LIBRARIES
 	NAMES ZXing libZXing
-	PATH_SUFFIXES bin lib lib64
+	PATH_SUFFIXES Frameworks bin lib lib64
 )
 
 include(FindPackageHandleStandardArgs)