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

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

Adds private headers handling...
Michal Klocek -
r193:862e361671e1
parent child
Show More
Show file before | Show file after | Hide comments
@@ -3,7 +3,15
3 }
3 }
4
4
5 TEMPLATE = subdirs
5 TEMPLATE = subdirs
6 SUBDIRS += src qmlplugin example test
6 SUBDIRS += src
7
8 integrated_build:{
9 message('Configured for integrated build')
10 SUBDIRS += example test qmlplugin
11 }else{
12 message('Please build example test and qmlplugin after installing library.')
13 }
14
7 CONFIG += ordered
15 CONFIG += ordered
8 QMAKE_CXXFLAGS += -g -Wall
16 QMAKE_CXXFLAGS += -g -Wall
9 unix:QMAKE_DISTCLEAN += -r build bin
17 unix:QMAKE_DISTCLEAN += -r build bin
Show file before | Show file after | Hide comments
@@ -1,13 +1,15
1 CONFIG+=integrated_build #remove if you want to build against installed libs
1 CONFIG+=integrated_build #remove if you want to build against installed libs
2
2
3 CHART_BUILD_HEADER_DIR = $$PWD/include
3 CHART_BUILD_PUBLIC_HEADER_DIR = $$PWD/include
4 CHART_BUILD_PRIVATE_HEADER_DIR = $$CHART_BUILD_PUBLIC_HEADER_DIR/private
4 CHART_BUILD_LIB_DIR = $$PWD/lib
5 CHART_BUILD_LIB_DIR = $$PWD/lib
5 CHART_BUILD_DIR = $$PWD/build
6 CHART_BUILD_DIR = $$PWD/build
6 CHART_BUILD_BIN_DIR = $$PWD/bin
7 CHART_BUILD_BIN_DIR = $$PWD/bin
7
8
8 # hack to fix windows builds
9 # hack to fix windows builds
9 win32:{
10 win32:{
10 CHART_BUILD_HEADER_DIR = $$replace(CHART_BUILD_HEADER_DIR, "/","\\")
11 CHART_BUILD_PUBLIC_HEADER_DIR = $$replace(CHART_BUILD_PUBLIC_HEADER_DIR, "/","\\")
12 CHART_BUILD_PRIVATE_HEADER_DIR = $$replace(CHART_BUILD_PRIVATE_HEADER_DIR, "/","\\")
11 CHART_BUILD_LIB_DIR = $$replace(CHART_BUILD_LIB_DIR, "/","\\")
13 CHART_BUILD_LIB_DIR = $$replace(CHART_BUILD_LIB_DIR, "/","\\")
12 CHART_BUILD_BUILD_DIR = $$replace(CHART_BUILD_BUILD_DIR, "/","\\")
14 CHART_BUILD_BUILD_DIR = $$replace(CHART_BUILD_BUILD_DIR, "/","\\")
13 CHART_BUILD_BIN_DIR = $$replace(CHART_BUILD_BIN_DIR, "/","\\")
15 CHART_BUILD_BIN_DIR = $$replace(CHART_BUILD_BIN_DIR, "/","\\")
Show file before | Show file after | Hide comments
@@ -1,6 +1,6
1 integrated_build:{
1 integrated_build:{
2 message('Internal build within charts core source tree')
2 message('Running integrated build against local libs...')
3 INCLUDEPATH += $$CHART_BUILD_HEADER_DIR
3 INCLUDEPATH += $$CHART_BUILD_PUBLIC_HEADER_DIR
4
4
5 !win32: {
5 !win32: {
6 LIBS += -L $$CHART_BUILD_LIB_DIR -Wl,-rpath,$$CHART_BUILD_LIB_DIR
6 LIBS += -L $$CHART_BUILD_LIB_DIR -Wl,-rpath,$$CHART_BUILD_LIB_DIR
@@ -45,5 +45,6 integrated_build:{
45 }
45 }
46
46
47 } else {
47 } else {
48 message('Running build aginst system libs...')
48 CONFIG+=qtcommercialchart
49 CONFIG+=qtcommercialchart
49 }
50 }
Show file before | Show file after | Hide comments
@@ -89,15 +89,23 public_headers.files = $$PUBLIC_HEADERS
89 target.path = $$[QT_INSTALL_LIBS]
89 target.path = $$[QT_INSTALL_LIBS]
90 INSTALLS += target \
90 INSTALLS += target \
91 public_headers
91 public_headers
92 install_build_headers.name = bild_headers
92 install_build_public_headers.name = bild_public_headers
93 install_build_headers.output = $$CHART_BUILD_HEADER_DIR/${QMAKE_FILE_BASE}.h
93 install_build_public_headers.output = $$CHART_BUILD_PUBLIC_HEADER_DIR/${QMAKE_FILE_BASE}.h
94 install_build_headers.input = PUBLIC_HEADERS
94 install_build_public_headers.input = PUBLIC_HEADERS
95 install_build_headers.commands = $$QMAKE_COPY \
95 install_build_public_headers.commands = $$QMAKE_COPY \
96 ${QMAKE_FILE_NAME} \
96 ${QMAKE_FILE_NAME} \
97 $$CHART_BUILD_HEADER_DIR
97 $$CHART_BUILD_PUBLIC_HEADER_DIR
98 install_build_headers.CONFIG += target_predeps \
98 install_build_public_headers.CONFIG += target_predeps \
99 no_link
99 no_link
100 QMAKE_EXTRA_COMPILERS += install_build_headers
100 install_build_private_headers.name = bild_private_headers
101 install_build_private_headers.output = $$CHART_BUILD_PRIVATE_HEADER_DIR/${QMAKE_FILE_BASE}.h
102 install_build_private_headers.input = PRIVATE_HEADERS
103 install_build_private_headers.commands = $$QMAKE_COPY \
104 ${QMAKE_FILE_NAME} \
105 $$CHART_BUILD_PRIVATE_HEADER_DIR
106 install_build_private_headers.CONFIG += target_predeps \
107 no_link
108 QMAKE_EXTRA_COMPILERS += install_build_public_headers install_build_private_headers
101 chartversion.target = qchartversion_p.h
109 chartversion.target = qchartversion_p.h
102 chartversion.commands = @echo \
110 chartversion.commands = @echo \
103 "build_time" \
111 "build_time" \
General Comments 0
You need to be logged in to leave comments. Login now