Fix sqlcipher and OSX 10.10 build.

Building under Mac OS X 10.10 was broken using latest QT SDK. Add
missing macextras and fix INCLUDEPATH for mac.
This commit is contained in:
Jens Hoffmann
2015-07-14 21:37:01 +02:00
parent 6af05770f6
commit 3f4ba5982f
2 changed files with 12 additions and 3 deletions
+9 -1
View File
@@ -10,6 +10,10 @@ else()
add_definitions(${QT_DEFINITIONS})
endif()
if(APPLE AND USE_QT5)
find_package(Qt5MacExtras)
endif()
add_definitions(-DSCINTILLA_QT)
add_definitions(-DSCI_LEXER)
@@ -154,5 +158,9 @@ include_directories(. ../include ../lexlib ../src)
add_library(qscintilla2 ${QSCINTILLA_SRC} ${QSCINTILLA_HDR} ${QSCINTILLA_MOC_HDR} ${QSCINTILLA_MOC})
if(USE_QT5)
qt5_use_modules(qscintilla2 Widgets PrintSupport)
if (APPLE)
qt5_use_modules(qscintilla2 Widgets PrintSupport MacExtras)
else()
qt5_use_modules(qscintilla2 Widgets PrintSupport)
endif()
endif()
+3 -2
View File
@@ -142,8 +142,9 @@ win32 {
}
mac {
RC_FILE = macapp.icns
INCLUDEPATH += -I/usr/local/include \
-I/usr/local/opt/sqlite/include
QT+= macextras
INCLUDEPATH += /usr/local/include \
/usr/local/opt/sqlite/include
LIBS += -L/usr/local/lib \
-L/usr/local/opt/sqlite/lib \
-framework Carbon