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

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

Fix integrated build for vs20xx
Fix integrated build for vs20xx
Jani Honkonen - - Load All Authors

File last commit:

r201:21dc9bded068
r201:21dc9bded068
Show More
integrated.pri
56 lines | 3.1 KiB | text/plain | TextLexer
/ integrated.pri
History | Source | Raw |Copy content |Copy permalink
Michal Klocek
rename internal -> integrated build
 r43 integrated_build:{
Michal Klocek
Adds private headers handling...
 r193 message('Running integrated build against local libs...')
INCLUDEPATH += $$CHART_BUILD_PUBLIC_HEADER_DIR
Jani Honkonen
Bubblegum fix for vs2010 integrated build
 r130
!win32: {
LIBS += -L $$CHART_BUILD_LIB_DIR -Wl,-rpath,$$CHART_BUILD_LIB_DIR
Michal Klocek
fix integrated build issue
 r177 }else{
Jani Honkonen
Fix integrated build for vs20xx
 r201 win32-msvc*: {
# hack fix for error:
# "LINK : fatal error LNK1146: no argument specified with option '/LIBPATH:'"
QMAKE_LIBDIR += $$CHART_BUILD_LIB_DIR
}else{
LIBS += -L $$CHART_BUILD_LIB_DIR
}
Jani Honkonen
Bubblegum fix for vs2010 integrated build
 r130 }
Michal Klocek
Adjust bin direcotry in compilation config
 r41 DESTDIR = $$CHART_BUILD_BIN_DIR
Jani Honkonen
Bubblegum fix for vs2010 integrated build
 r130
Michal Klocek
Improved config handling...
 r33 CONFIG(debug, debug|release) {
Tero Ahola
Refactored the test app
 r110 LIBS += -lQtCommercialChartd
#this is ugly hack to work around missing rpath, it simply copies lib
win32:{
copylib.target = $$CHART_BUILD_BIN_DIR/QtCommercialChartd.dll
copylib.commands = $$QMAKE_COPY $$CHART_BUILD_LIB_DIR\\QtCommercialChartd.dll $$CHART_BUILD_BIN_DIR
copylib.depends = $$CHART_BUILD_LIB_DIR/QtCommercialChartd.dll
PRE_TARGETDEPS += $$CHART_BUILD_BIN_DIR/QtCommercialChartd.dll
QMAKE_EXTRA_TARGETS +=copylib
}
Michal Klocek
Add test to common build
 r34 } else {
Tero Ahola
Added size factor property to pie
 r60 LIBS += -lQtCommercialChart
Michal Klocek
Fix compilation config for windows
 r37
Tero Ahola
Added size factor property to pie
 r60 #this is ugly hack to work around missing rpath, it simply copies lib
win32: {
copylib.target = $$CHART_BUILD_BIN_DIR/QtCommercialChart
copylib.commands = $$QMAKE_COPY $$CHART_BUILD_LIB_DIR\\QtCommercialChart.dll $$CHART_BUILD_BIN_DIR
copylib.depends = $$CHART_BUILD_LIB_DIR/QtCommercialChart.dll
PRE_TARGETDEPS += $$CHART_BUILD_BIN_DIR/QtCommercialChart
QMAKE_EXTRA_TARGETS +=copylib
Michal Klocek
Fix compilation config for windows
 r37 }
Michal Klocek
Add test to common build
 r34 }
Tero Ahola
Hacked integrated builds on OSX to work
 r109
mac: {
# This is a hack to make binaries to use the internal version of the QtCommercial Charts library on OSX
QMAKE_POST_LINK += install_name_tool -change "libQtCommercialChartd.1.dylib" "@rpath/libQtCommercialChartd.dylib" $$CHART_BUILD_BIN_DIR/chartwidgettest.app/Contents/MacOS/chartwidgettest
QMAKE_POST_LINK += && install_name_tool -change "libQtCommercialChartd.1.dylib" "@rpath/libQtCommercialChartd.dylib" $$CHART_BUILD_BIN_DIR/barchart.app/Contents/MacOS/barchart
QMAKE_POST_LINK += && install_name_tool -change "libQtCommercialChartd.1.dylib" "@rpath/libQtCommercialChartd.dylib" $$CHART_BUILD_BIN_DIR/colorlineChart.app/Contents/MacOS/colorlineChart
QMAKE_POST_LINK += && install_name_tool -change "libQtCommercialChartd.1.dylib" "@rpath/libQtCommercialChartd.dylib" $$CHART_BUILD_BIN_DIR/lineChart.app/Contents/MacOS/lineChart
QMAKE_POST_LINK += && install_name_tool -change "libQtCommercialChartd.1.dylib" "@rpath/libQtCommercialChartd.dylib" $$CHART_BUILD_BIN_DIR/percentbarchart.app/Contents/MacOS/percentbarchart
QMAKE_POST_LINK += && install_name_tool -change "libQtCommercialChartd.1.dylib" "@rpath/libQtCommercialChartd.dylib" $$CHART_BUILD_BIN_DIR/stackedbarchart.app/Contents/MacOS/stackedbarchart
QMAKE_POST_LINK += && install_name_tool -change "libQtCommercialChartd.1.dylib" "@rpath/libQtCommercialChartd.dylib" $$CHART_BUILD_BIN_DIR/zoomLineChart.app/Contents/MacOS/zoomLineChart
}
Tero Ahola
Added size factor property to pie
 r60 } else {
Michal Klocek
Adds private headers handling...
 r193 message('Running build aginst system libs...')
Michal Klocek
Fix compilation config for windows
 r37 CONFIG+=qtcommercialchart
Michal Klocek
Improved config handling...
 r33 }