Merge branch 'daniviga-2.99' of http://daniele.vigano.me/git/dani/copr-dani-qgis into daniviga-2.99
This commit is contained in:
commit
8f4c229b06
|
@ -174,7 +174,8 @@ find . \( -name "*.cpp" -o -name "*.h" \) -type f -perm /111 -execdir chmod -x {
|
||||||
install -pm0644 %{SOURCE4} .
|
install -pm0644 %{SOURCE4} .
|
||||||
|
|
||||||
# Delete bundled libs
|
# Delete bundled libs
|
||||||
rm -rf src/core/gps/qextserialport/
|
# Using external QEXTSERIALPORT causes segfaults
|
||||||
|
# rm -rf src/core/gps/qextserialport/
|
||||||
|
|
||||||
gzip ChangeLog
|
gzip ChangeLog
|
||||||
|
|
||||||
|
@ -192,8 +193,9 @@ gzip ChangeLog
|
||||||
-D WITH_CUSTOM_WIDGETS:BOOL=TRUE \
|
-D WITH_CUSTOM_WIDGETS:BOOL=TRUE \
|
||||||
-D BINDINGS_GLOBAL_INSTALL:BOOL=TRUE \
|
-D BINDINGS_GLOBAL_INSTALL:BOOL=TRUE \
|
||||||
-D ENABLE_TESTS:BOOL=FALSE \
|
-D ENABLE_TESTS:BOOL=FALSE \
|
||||||
-D WITH_INTERNAL_QEXTSERIALPORT:BOOL=FALSE \
|
# Using external QEXTSERIALPORT causes segfaults
|
||||||
-D QEXTSERIALPORT_INCLUDE_DIR:STRING=%{_includedir}/QtExtSerialPort \
|
# -D WITH_INTERNAL_QEXTSERIALPORT:BOOL=FALSE \
|
||||||
|
# -D QEXTSERIALPORT_INCLUDE_DIR:STRING=%{_includedir}/QtExtSerialPort \
|
||||||
-D WITH_QSPATIALITE:BOOL=TRUE \
|
-D WITH_QSPATIALITE:BOOL=TRUE \
|
||||||
-D WITH_SERVER:BOOL=TRUE \
|
-D WITH_SERVER:BOOL=TRUE \
|
||||||
.
|
.
|
||||||
|
|
Reference in New Issue
Block a user