##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » USERS » JEANDET » qtcharts
RSS

Clone from http://code.qt.io/qt/qtcharts.git

Adjust bin direcotry in compilation config
Michal Klocek -
r41:f222db1b1731
parent child
Show More
Show file before | Show file after | Hide comments
@@ -1,16 +1,16
1 CONFIG+=internal_build #remove if you want to build against installed libs
1 CONFIG+=internal_build #remove if you want to build against installed libs
2
2
3 CHART_BUILD_HEADER_DIR = $$PWD/include
3 CHART_BUILD_HEADER_DIR = $$PWD/include
4 CHART_BUILD_LIB_DIR = $$PWD/lib
4 CHART_BUILD_LIB_DIR = $$PWD/lib
5 CHART_BUILD_DIR = $$PWD/build
5 CHART_BUILD_DIR = $$PWD/build
6 CHART_BUILD_BIN = $$PWD/bin
6 CHART_BUILD_BIN_DIR = $$PWD/bin
7
7
8 # hack to fix windows builds
8 # hack to fix windows builds
9
9
10 win32:{
10 win32:{
11 CHART_BUILD_HEADER_DIR = $$replace(CHART_BUILD_HEADER_DIR, "/","\\")
11 CHART_BUILD_HEADER_DIR = $$replace(CHART_BUILD_HEADER_DIR, "/","\\")
12 CHART_BUILD_LIB_DIR = $$replace(CHART_BUILD_LIB_DIR, "/","\\")
12 CHART_BUILD_LIB_DIR = $$replace(CHART_BUILD_LIB_DIR, "/","\\")
13 CHART_BUILD_BUILD_DIR = $$replace(CHART_BUILD_BUILD_DIR, "/","\\")
13 CHART_BUILD_BUILD_DIR = $$replace(CHART_BUILD_BUILD_DIR, "/","\\")
14 CHART_BUILD_BIN_DIR = $$replace(CHART_BUILD_BIN_DIR, "/","\\")
14 CHART_BUILD_BIN_DIR = $$replace(CHART_BUILD_BIN_DIR, "/","\\")
15 }
15 }
16
16
Show file before | Show file after | Hide comments
@@ -1,32 +1,32
1 internal_build:{
1 internal_build:{
2 message('Internal build within charts core source tree')
2 message('Internal build within charts core source tree')
3 INCLUDEPATH += $$CHART_BUILD_HEADER_DIR
3 INCLUDEPATH += $$CHART_BUILD_HEADER_DIR
4 LIBS += -L $$CHART_BUILD_LIB_DIR -Wl,-rpath,$$CHART_BUILD_LIB_DIR
4 LIBS += -L $$CHART_BUILD_LIB_DIR -Wl,-rpath,$$CHART_BUILD_LIB_DIR
5 DESTDIR = $$CHART_BUILD_BIN
5 DESTDIR = $$CHART_BUILD_BIN_DIR
6 CONFIG(debug, debug|release) {
6 CONFIG(debug, debug|release) {
7 LIBS += -lQtCommercialChartd
7 LIBS += -lQtCommercialChartd
8
8
9 #this is ugly hack to work around missing rpath, it simply copies lib
9 #this is ugly hack to work around missing rpath, it simply copies lib
10 win32:{
10 win32:{
11 copylib.target = QtCommercialChartd.dll
11 copylib.target = $$CHART_BUILD_BIN_DIR/QtCommercialChartd.dll
12 copylib.commands = $$QMAKE_COPY $$CHART_BUILD_LIB_DIR\QtCommercialChartd.dll $$CHART_BUILD_BIN_DIR
12 copylib.commands = $$QMAKE_COPY $$CHART_BUILD_LIB_DIR\QtCommercialChartd.dll $$CHART_BUILD_BIN_DIR
13 copylib.depends = $$CHART_BUILD_LIB_DIR/QtCommercialChartd.dll
13 copylib.depends = $$CHART_BUILD_LIB_DIR/QtCommercialChartd.dll
14 PRE_TARGETDEPS += QtCommercialChartd.dll
14 PRE_TARGETDEPS += $$CHART_BUILD_BIN_DIR/QtCommercialChartd.dll
15 QMAKE_EXTRA_TARGETS +=copylib
15 QMAKE_EXTRA_TARGETS +=copylib
16 }
16 }
17
17
18 } else {
18 } else {
19 LIBS += -lQtCommercialChart
19 LIBS += -lQtCommercialChart
20
20
21 #this is ugly hack to work around missing rpath, it simply copies lib
21 #this is ugly hack to work around missing rpath, it simply copies lib
22 win32:{
22 win32:{
23 copylib.target = QtCommercialChart
23 copylib.target = $$CHART_BUILD_BIN_DIR/QtCommercialChart
24 copylib.commands = $$QMAKE_COPY $$CHART_BUILD_LIB_DIR\QtCommercialChart.dll $$CHART_BUILD_BIN_DIR
24 copylib.commands = $$QMAKE_COPY $$CHART_BUILD_LIB_DIR\QtCommercialChart.dll $$CHART_BUILD_BIN_DIR
25 copylib.depends = $$CHART_BUILD_LIB_DIR/QtCommercialChart.dll
25 copylib.depends = $$CHART_BUILD_LIB_DIR/QtCommercialChart.dll
26 PRE_TARGETDEPS += QtCommercialChart
26 PRE_TARGETDEPS += $$CHART_BUILD_BIN_DIR/QtCommercialChart
27 QMAKE_EXTRA_TARGETS +=copylib
27 QMAKE_EXTRA_TARGETS +=copylib
28 }
28 }
29 }
29 }
30 }else{
30 }else{
31 CONFIG+=qtcommercialchart
31 CONFIG+=qtcommercialchart
32 }
32 }
General Comments 0
You need to be logged in to leave comments. Login now