##// END OF EJS Templates
Removed system_build from build config
Tero Ahola -
r1439:6a4c0baf9e46
parent child
Show More
@@ -7,17 +7,6 SUBDIRS = src plugins examples demos tests
7
7
8 development_build: message('Development build')
8 development_build: message('Development build')
9
9
10 !system_build:{
11 message('Configured for local build against local libs...')
12 message('You can run "make" to build qchart library, examples, demos and plugin...')
13 message('You can run "make install" to install qchart in qt sdk...')
14 } else {
15 message('Running build aginst system libs...')
16 message('Building only charts library...')
17 message('Afterwards you can run "cd examples; qmake ; make " to build examples.')
18 SUBDIRS = src
19 }
20
21 CONFIG += ordered
10 CONFIG += ordered
22 QMAKE_CXXFLAGS += -g -Wall
11 QMAKE_CXXFLAGS += -g -Wall
23 unix:QMAKE_DISTCLEAN += -r build bin include lib doc/html
12 unix:QMAKE_DISTCLEAN += -r build bin include lib doc/html
@@ -1,6 +1,11
1
1
2 LIBRARY_NAME = QtCommercialChart
2 LIBRARY_NAME = QtCommercialChart
3 coverage: CONFIG+=debug
3 CONFIG(debug, debug|release) {
4 mac: LIBRARY_NAME = $$join(LIBRARY_NAME,,,_debug)
5 win32: LIBRARY_NAME = $$join(LIBRARY_NAME,,,d)
6 }
7
8 coverage: CONFIG += debug
4
9
5 ##################### SHADOW CONFIG #################################################
10 ##################### SHADOW CONFIG #################################################
6
11
@@ -62,32 +67,22 development_build: {
62
67
63 ##################### BUILD CONFIG ########################################################
68 ##################### BUILD CONFIG ########################################################
64
69
65 CONFIG(debug, debug|release) {
70 INCLUDEPATH += $$CHART_BUILD_PUBLIC_HEADER_DIR
66 mac: LIBRARY_NAME = $$join(LIBRARY_NAME,,,_debug)
67 win32: LIBRARY_NAME = $$join(LIBRARY_NAME,,,d)
68 }
69
70 !system_build:{
71
72 INCLUDEPATH += $$CHART_BUILD_PUBLIC_HEADER_DIR
73
71
74 !win32: {
72 !win32: {
75 LIBS += -L $$CHART_BUILD_LIB_DIR -Wl,-rpath,$$CHART_BUILD_LIB_DIR
73 LIBS += -L $$CHART_BUILD_LIB_DIR -Wl,-rpath,$$CHART_BUILD_LIB_DIR
74 } else {
75 win32-msvc*: {
76 # hack fix for error:
77 # "LINK : fatal error LNK1146: no argument specified with option '/LIBPATH:'"
78 QMAKE_LIBDIR += $$CHART_BUILD_LIB_DIR
76 } else {
79 } else {
77 win32-msvc*: {
80 LIBS += -L $$CHART_BUILD_LIB_DIR
78 # hack fix for error:
79 # "LINK : fatal error LNK1146: no argument specified with option '/LIBPATH:'"
80 QMAKE_LIBDIR += $$CHART_BUILD_LIB_DIR
81 } else {
82 LIBS += -L $$CHART_BUILD_LIB_DIR
83 }
84 }
81 }
85
86 LIBS += -l$$LIBRARY_NAME
87 } else {
88 CONFIG += qtcommercialchart
89 }
82 }
90
83
84 LIBS += -l$$LIBRARY_NAME
85
91 ##################### UNIT TESTS ##############################################################
86 ##################### UNIT TESTS ##############################################################
92
87
93 CONFIG(debug, debug|release) {
88 CONFIG(debug, debug|release) {
General Comments 0
You need to be logged in to leave comments. Login now