Skip to content

Commit 4670aab

Browse files
committed
build: fix incorrect line endings
1 parent b2b6ce6 commit 4670aab

File tree

1 file changed

+167
-167
lines changed

1 file changed

+167
-167
lines changed

cbird.pri

Lines changed: 167 additions & 167 deletions
Original file line numberDiff line numberDiff line change
@@ -1,167 +1,167 @@
1-
2-
# general configuration for cbird and unit tests
3-
4-
# too many breaking changes
5-
equals(QT_MAJOR_VERSION, 5) {
6-
error("QT 6 is required")
7-
}
8-
9-
QT *= core sql concurrent xml
10-
CONFIG *= c++17 console
11-
12-
macx {
13-
CONFIG -= app_bundle
14-
}
15-
16-
VERSION=0.7.3
17-
18-
QMAKE_CXXFLAGS += -fdiagnostics-color=always
19-
QMAKE_CXXFLAGS += -Wno-deprecated-declarations
20-
#QMAKE_CXXFLAGS += -Werror
21-
22-
# cimg has openmp support, doesn't do much (qualityscore())
23-
#QMAKE_CXXFLAGS += -fopenmp
24-
#QMAKE_LFLAGS += -fopenmp
25-
26-
# autotools-style compiler override, also needed for appimage
27-
CXX=$$(CXX)
28-
!isEmpty(CXX) {
29-
QMAKE_CXX=$$CXX
30-
QMAKE_LINK=$$CXX
31-
}
32-
CC=$$(CC)
33-
!isEmpty(CC) {
34-
QMAKE_CC=$$CC
35-
}
36-
37-
DESTDIR=$$_PRO_FILE_PWD_
38-
BUILDDIR=_build
39-
40-
macx: BUILDDIR=_mac
41-
win32: BUILDDIR=_win32
42-
43-
MOC_DIR=$$BUILDDIR
44-
OBJECTS_DIR=$$BUILDDIR
45-
RCC_DIR=$$BUILDDIR
46-
UI_DIR=$$BUILDDIR
47-
48-
DEFINES += QT_FORCE_ASSERTS # Q_ASSERT(0) crashes the app
49-
DEFINES += QT_MESSAGELOGCONTEXT # nice for custom logger
50-
DEFINES += ENABLE_CIMG # still needed for qualityscore
51-
DEFINES += QT_STRICT_ITERATORS # find inefficient iterators
52-
53-
# enable debug build/features, NOT CONFIG += debug
54-
# DEFINES += DEBUG
55-
# DEFINES += DEBUG_OPTIMIZED
56-
contains(BUILD, debug) { DEFINES += DEBUG }
57-
contains(BUILD, debugOptimized) { DEFINES += DEBUG_OPTIMIZED }
58-
59-
# private headers for DebugEventFilter
60-
QTCORE_PRIVATE_HEADERS="$$[QT_INSTALL_HEADERS]/QtCore/$$QT_VERSION"
61-
!exists( $$QTCORE_PRIVATE_HEADERS ) {
62-
message("$${QTCORE_PRIVATE_HEADERS}/")
63-
error("Can't find qtcore private headers, maybe you need qt6-base-private-dev")
64-
}
65-
INCLUDEPATH += $$QTCORE_PRIVATE_HEADERS
66-
67-
win32 {
68-
INCLUDEPATH += _libs-win32/build-opencv/install/include
69-
LIBS += -L_libs-win32/build-opencv/install/x64/mingw/lib
70-
OPENCV_VERSION = 2413
71-
OPENCV_LIBS *= ml objdetect stitching superres videostab calib3d
72-
OPENCV_LIBS *= features2d highgui video photo imgproc flann core
73-
for (CVLIB, OPENCV_LIBS) {
74-
LIBS *= -lopencv_$${CVLIB}$${OPENCV_VERSION}
75-
}
76-
77-
INCLUDEPATH += _libs-win32/build-mxe/include
78-
LIBS += -L_libs-win32/build-mxe/lib
79-
80-
INCLUDEPATH += _libs-win32/build-mxe/include/QuaZip-Qt6-1.4
81-
LIBS += -lquazip1-qt6
82-
83-
LIBS *= -lz -lpsapi -ldwmapi
84-
}
85-
86-
macx {
87-
# homebrew configuration
88-
QT *= dbus
89-
90-
INCLUDEPATH *= /usr/local/include
91-
LIBS *= -L/usr/local/lib
92-
LIBS *= -ltermcap
93-
94-
OPENCV_LIBS *= ml objdetect stitching superres videostab calib3d
95-
OPENCV_LIBS *= features2d highgui video photo imgproc flann core
96-
for (CVLIB, OPENCV_LIBS) {
97-
LIBS *= -lopencv_$${CVLIB}
98-
}
99-
100-
LIBS *= -lquazip1-qt6
101-
}
102-
103-
unix:!macx {
104-
QT += dbus
105-
106-
INCLUDEPATH *= /usr/local/include
107-
108-
LIBS *= -L/usr/local/lib
109-
LIBS *= -ltermcap
110-
111-
CV_REQUIRED=2.4.13.7
112-
CV_VERSION=$$system("pkg-config opencv --modversion")
113-
!equals(CV_VERSION,$$CV_REQUIRED) {
114-
error("OpenCV $$CV_REQUIRED is required, found version <$$CV_VERSION>")
115-
}
116-
LIBS *= $$system("pkg-config opencv --libs")
117-
118-
# quazip uses a funky versioned include directory...and now qt6 doesn't seem
119-
# to distribute pkg-config files at all (Ubuntu 22.04) but they're still in the source build
120-
# .. so we need to find quazip ourself
121-
# TODO: qt6 seems to have moved to cmake so throw all of this out..
122-
QUAZIP_MODULE=quazip1-qt6
123-
QUAZIP_VERSION=$$system("pkg-config $$QUAZIP_MODULE --modversion") # 1.4
124-
QUAZIP_HEADERS="/usr/local/include/QuaZip-Qt6-$$QUAZIP_VERSION"
125-
QUAZIP_LIB = "/usr/local/lib/lib$${QUAZIP_MODULE}.so"
126-
127-
!exists($$QUAZIP_HEADERS) {
128-
message(expected QuaZip headers in $$QUAZIP_HEADERS)
129-
error(quazip headers elude me)
130-
}
131-
INCLUDEPATH *= $$QUAZIP_HEADERS
132-
133-
!exists($$QUAZIP_LIB) {
134-
message(expected QuaZip lib at $$QUAZIP_LIB)
135-
error(quazip lib eludes me)
136-
}
137-
138-
LIBS *= -l$${QUAZIP_MODULE} -lz
139-
}
140-
141-
# cross-platform common libs
142-
contains(DEFINES, ENABLE_CIMG) LIBS *= -lpng -ljpeg
143-
LIBS *= -lavcodec -lavformat -lavutil -lswscale
144-
LIBS *= -lexiv2
145-
146-
# testing other search tree implementations
147-
# LIBS *= lib/vptree/lib/libvptree.a
148-
149-
contains(DEFINES, DEBUG) {
150-
warning("******************************")
151-
warning("DEBUG BUILD")
152-
warning("******************************")
153-
contains(DEFINES, DEBUG_OPTIMIZED) {
154-
QMAKE_CXXFLAGS_RELEASE = -g -Ofast -march=native
155-
}
156-
else {
157-
QMAKE_CXXFLAGS_RELEASE = -g -O0
158-
}
159-
}
160-
else {
161-
# westmere is latest that I can run in qemu, and
162-
# it has popcnt (population count) which is nice for hamm64()
163-
win32: QMAKE_CXXFLAGS_RELEASE = -Ofast -march=westmere
164-
165-
unix: QMAKE_CXXFLAGS_RELEASE = -Ofast -march=native
166-
}
167-
1+
2+
# general configuration for cbird and unit tests
3+
4+
# too many breaking changes
5+
equals(QT_MAJOR_VERSION, 5) {
6+
error("QT 6 is required")
7+
}
8+
9+
QT *= core sql concurrent xml
10+
CONFIG *= c++17 console
11+
12+
macx {
13+
CONFIG -= app_bundle
14+
}
15+
16+
VERSION=0.7.3
17+
18+
QMAKE_CXXFLAGS += -fdiagnostics-color=always
19+
QMAKE_CXXFLAGS += -Wno-deprecated-declarations
20+
#QMAKE_CXXFLAGS += -Werror
21+
22+
# cimg has openmp support, doesn't do much (qualityscore())
23+
#QMAKE_CXXFLAGS += -fopenmp
24+
#QMAKE_LFLAGS += -fopenmp
25+
26+
# autotools-style compiler override, also needed for appimage
27+
CXX=$$(CXX)
28+
!isEmpty(CXX) {
29+
QMAKE_CXX=$$CXX
30+
QMAKE_LINK=$$CXX
31+
}
32+
CC=$$(CC)
33+
!isEmpty(CC) {
34+
QMAKE_CC=$$CC
35+
}
36+
37+
DESTDIR=$$_PRO_FILE_PWD_
38+
BUILDDIR=_build
39+
40+
macx: BUILDDIR=_mac
41+
win32: BUILDDIR=_win32
42+
43+
MOC_DIR=$$BUILDDIR
44+
OBJECTS_DIR=$$BUILDDIR
45+
RCC_DIR=$$BUILDDIR
46+
UI_DIR=$$BUILDDIR
47+
48+
DEFINES += QT_FORCE_ASSERTS # Q_ASSERT(0) crashes the app
49+
DEFINES += QT_MESSAGELOGCONTEXT # nice for custom logger
50+
DEFINES += ENABLE_CIMG # still needed for qualityscore
51+
DEFINES += QT_STRICT_ITERATORS # find inefficient iterators
52+
53+
# enable debug build/features, NOT CONFIG += debug
54+
# DEFINES += DEBUG
55+
# DEFINES += DEBUG_OPTIMIZED
56+
contains(BUILD, debug) { DEFINES += DEBUG }
57+
contains(BUILD, debugOptimized) { DEFINES += DEBUG_OPTIMIZED }
58+
59+
# private headers for DebugEventFilter
60+
QTCORE_PRIVATE_HEADERS="$$[QT_INSTALL_HEADERS]/QtCore/$$QT_VERSION"
61+
!exists( $$QTCORE_PRIVATE_HEADERS ) {
62+
message("$${QTCORE_PRIVATE_HEADERS}/")
63+
error("Can't find qtcore private headers, maybe you need qt6-base-private-dev")
64+
}
65+
INCLUDEPATH += $$QTCORE_PRIVATE_HEADERS
66+
67+
win32 {
68+
INCLUDEPATH += _libs-win32/build-opencv/install/include
69+
LIBS += -L_libs-win32/build-opencv/install/x64/mingw/lib
70+
OPENCV_VERSION = 2413
71+
OPENCV_LIBS *= ml objdetect stitching superres videostab calib3d
72+
OPENCV_LIBS *= features2d highgui video photo imgproc flann core
73+
for (CVLIB, OPENCV_LIBS) {
74+
LIBS *= -lopencv_$${CVLIB}$${OPENCV_VERSION}
75+
}
76+
77+
INCLUDEPATH += _libs-win32/build-mxe/include
78+
LIBS += -L_libs-win32/build-mxe/lib
79+
80+
INCLUDEPATH += _libs-win32/build-mxe/include/QuaZip-Qt6-1.4
81+
LIBS += -lquazip1-qt6
82+
83+
LIBS *= -lz -lpsapi -ldwmapi
84+
}
85+
86+
macx {
87+
# homebrew configuration
88+
QT *= dbus
89+
90+
INCLUDEPATH *= /usr/local/include
91+
LIBS *= -L/usr/local/lib
92+
LIBS *= -ltermcap
93+
94+
OPENCV_LIBS *= ml objdetect stitching superres videostab calib3d
95+
OPENCV_LIBS *= features2d highgui video photo imgproc flann core
96+
for (CVLIB, OPENCV_LIBS) {
97+
LIBS *= -lopencv_$${CVLIB}
98+
}
99+
100+
LIBS *= -lquazip1-qt6
101+
}
102+
103+
unix:!macx {
104+
QT += dbus
105+
106+
INCLUDEPATH *= /usr/local/include
107+
108+
LIBS *= -L/usr/local/lib
109+
LIBS *= -ltermcap
110+
111+
CV_REQUIRED=2.4.13.7
112+
CV_VERSION=$$system("pkg-config opencv --modversion")
113+
!equals(CV_VERSION,$$CV_REQUIRED) {
114+
error("OpenCV $$CV_REQUIRED is required, found version <$$CV_VERSION>")
115+
}
116+
LIBS *= $$system("pkg-config opencv --libs")
117+
118+
# quazip uses a funky versioned include directory...and now qt6 doesn't seem
119+
# to distribute pkg-config files at all (Ubuntu 22.04) but they're still in the source build
120+
# .. so we need to find quazip ourself
121+
# TODO: qt6 seems to have moved to cmake so throw all of this out..
122+
QUAZIP_MODULE=quazip1-qt6
123+
QUAZIP_VERSION=$$system("pkg-config $$QUAZIP_MODULE --modversion") # 1.4
124+
QUAZIP_HEADERS="/usr/local/include/QuaZip-Qt6-$$QUAZIP_VERSION"
125+
QUAZIP_LIB = "/usr/local/lib/lib$${QUAZIP_MODULE}.so"
126+
127+
!exists($$QUAZIP_HEADERS) {
128+
message(expected QuaZip headers in $$QUAZIP_HEADERS)
129+
error(quazip headers elude me)
130+
}
131+
INCLUDEPATH *= $$QUAZIP_HEADERS
132+
133+
!exists($$QUAZIP_LIB) {
134+
message(expected QuaZip lib at $$QUAZIP_LIB)
135+
error(quazip lib eludes me)
136+
}
137+
138+
LIBS *= -l$${QUAZIP_MODULE} -lz
139+
}
140+
141+
# cross-platform common libs
142+
contains(DEFINES, ENABLE_CIMG) LIBS *= -lpng -ljpeg
143+
LIBS *= -lavcodec -lavformat -lavutil -lswscale
144+
LIBS *= -lexiv2
145+
146+
# testing other search tree implementations
147+
# LIBS *= lib/vptree/lib/libvptree.a
148+
149+
contains(DEFINES, DEBUG) {
150+
warning("******************************")
151+
warning("DEBUG BUILD")
152+
warning("******************************")
153+
contains(DEFINES, DEBUG_OPTIMIZED) {
154+
QMAKE_CXXFLAGS_RELEASE = -g -Ofast -march=native
155+
}
156+
else {
157+
QMAKE_CXXFLAGS_RELEASE = -g -O0
158+
}
159+
}
160+
else {
161+
# westmere is latest that I can run in qemu, and
162+
# it has popcnt (population count) which is nice for hamm64()
163+
win32: QMAKE_CXXFLAGS_RELEASE = -Ofast -march=westmere
164+
165+
unix: QMAKE_CXXFLAGS_RELEASE = -Ofast -march=native
166+
}
167+

0 commit comments

Comments
 (0)