Peter M. Groen / openbr

Commit a1d233248d691cb8613db2ae25abb1752b0ff677

Authored by Josh Klontz
Committed by GitHub
1 parent b7147cc3

Ios updates (#576) 

* new versions of Qt require MobileCoreServices framework

* bump qtpcre lib version
Inline Side-by-side
Showing 1 changed file with 2 additions and 2 deletions
CMakeLists.txt
  View file @a1d2332
@@ -83,7 +83,7 @@ find_package(Qt5 COMPONENTS ${QT_DEPENDENCIES} REQUIRED) @@ -83,7 +83,7 @@ find_package(Qt5 COMPONENTS ${QT_DEPENDENCIES} REQUIRED)
83 83
84 set(BR_THIRDPARTY_LIBS ${BR_THIRDPARTY_LIBS} ${Qt5Core_QTMAIN_LIBRARIES}) 84 set(BR_THIRDPARTY_LIBS ${BR_THIRDPARTY_LIBS} ${Qt5Core_QTMAIN_LIBRARIES})
85 if(IOS) 85 if(IOS)
86 - list(APPEND BR_THIRDPARTY_LIBS "${_qt5Core_install_prefix}/lib/libqtpcre.a") 86 + list(APPEND BR_THIRDPARTY_LIBS "${_qt5Core_install_prefix}/lib/libqtpcre2.a")
87 endif() 87 endif()
88 88
89 # Find OpenCV 89 # Find OpenCV
@@ -91,7 +91,7 @@ find_package(OpenCV 2.4.5 REQUIRED) @@ -91,7 +91,7 @@ find_package(OpenCV 2.4.5 REQUIRED)
91 if(IOS) 91 if(IOS)
92 file(GLOB OPENCV_IOS_LIBS "${OpenCV_DIR}/../../lib/*.a") 92 file(GLOB OPENCV_IOS_LIBS "${OpenCV_DIR}/../../lib/*.a")
93 list(APPEND BR_THIRDPARTY_LIBS ${OPENCV_IOS_LIBS}) 93 list(APPEND BR_THIRDPARTY_LIBS ${OPENCV_IOS_LIBS})
94 - list(APPEND BR_THIRDPARTY_LIBS "-framework Foundation -framework UIKit -framework Security -lc++") 94 + list(APPEND BR_THIRDPARTY_LIBS "-framework Foundation -framework UIKit -framework Security -framework MobileCoreServices -lc++")
95 else() 95 else()
96 set(OPENCV_DEPENDENCIES opencv_core opencv_highgui opencv_imgproc opencv_ml) 96 set(OPENCV_DEPENDENCIES opencv_core opencv_highgui opencv_imgproc opencv_ml)
97 set(BR_THIRDPARTY_LIBS ${BR_THIRDPARTY_LIBS} ${OPENCV_DEPENDENCIES}) 97 set(BR_THIRDPARTY_LIBS ${BR_THIRDPARTY_LIBS} ${OPENCV_DEPENDENCIES})