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

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

Fixed naming of the lib on system build; debug on OSX and Win
Tero Ahola -
r1431:e9fe3eb4488c
parent child
Show More
Side by Side Unified
Context file:
r1431:e9fe3eb4488c Loading diff...:
Show file before | Show file after | Hide comments
@@ -1,93 +1,93
1
1
2 LIBRARY_NAME = QtCommercialChart
2 LIBRARY_NAME = QtCommercialChart
3 coverage: CONFIG+=debug
3 coverage: CONFIG+=debug
4
4
5 ##################### SHADOW CONFIG #################################################
5 ##################### SHADOW CONFIG #################################################
6
6
7 !contains($${PWD}, $${OUT_PWD}){
7 !contains($${PWD}, $${OUT_PWD}){
8 search = "$$PWD:::"
8 search = "$$PWD:::"
9 temp = $$split(search,"/")
9 temp = $$split(search,"/")
10 temp = $$last(temp)
10 temp = $$last(temp)
11 path = $$replace(search,$$temp,'')
11 path = $$replace(search,$$temp,'')
12 temp = $$split(OUT_PWD,$$path)
12 temp = $$split(OUT_PWD,$$path)
13 temp = $$split(temp,'/')
13 temp = $$split(temp,'/')
14 temp = $$first(temp)
14 temp = $$first(temp)
15 path = "$${path}$${temp}"
15 path = "$${path}$${temp}"
16 SHADOW=$$path
16 SHADOW=$$path
17 }else{
17 }else{
18 SHADOW=$$PWD
18 SHADOW=$$PWD
19 CONFIG-=development_build
19 CONFIG-=development_build
20 }
20 }
21
21
22 ##################### BUILD PATHS ##################################################
22 ##################### BUILD PATHS ##################################################
23
23
24 CHART_BUILD_PUBLIC_HEADER_DIR = $$SHADOW/include
24 CHART_BUILD_PUBLIC_HEADER_DIR = $$SHADOW/include
25 CHART_BUILD_PRIVATE_HEADER_DIR = $$CHART_BUILD_PUBLIC_HEADER_DIR/private
25 CHART_BUILD_PRIVATE_HEADER_DIR = $$CHART_BUILD_PUBLIC_HEADER_DIR/private
26 CHART_BUILD_LIB_DIR = $$SHADOW/lib
26 CHART_BUILD_LIB_DIR = $$SHADOW/lib
27 CHART_BUILD_DIR = $$SHADOW/build
27 CHART_BUILD_DIR = $$SHADOW/build
28 CHART_BUILD_BIN_DIR = $$SHADOW/bin
28 CHART_BUILD_BIN_DIR = $$SHADOW/bin
29 CHART_BUILD_PLUGIN_DIR = $$CHART_BUILD_BIN_DIR/QtCommercial/Chart
29 CHART_BUILD_PLUGIN_DIR = $$CHART_BUILD_BIN_DIR/QtCommercial/Chart
30 CHART_BUILD_DOC_DIR = $$SHADOW/doc
30 CHART_BUILD_DOC_DIR = $$SHADOW/doc
31
31
32 win32:{
32 win32:{
33 CHART_BUILD_PUBLIC_HEADER_DIR = $$replace(CHART_BUILD_PUBLIC_HEADER_DIR, "/","\\")
33 CHART_BUILD_PUBLIC_HEADER_DIR = $$replace(CHART_BUILD_PUBLIC_HEADER_DIR, "/","\\")
34 CHART_BUILD_PRIVATE_HEADER_DIR = $$replace(CHART_BUILD_PRIVATE_HEADER_DIR, "/","\\")
34 CHART_BUILD_PRIVATE_HEADER_DIR = $$replace(CHART_BUILD_PRIVATE_HEADER_DIR, "/","\\")
35 CHART_BUILD_BUILD_DIR = $$replace(CHART_BUILD_BUILD_DIR, "/","\\")
35 CHART_BUILD_BUILD_DIR = $$replace(CHART_BUILD_BUILD_DIR, "/","\\")
36 CHART_BUILD_BIN_DIR = $$replace(CHART_BUILD_BIN_DIR, "/","\\")
36 CHART_BUILD_BIN_DIR = $$replace(CHART_BUILD_BIN_DIR, "/","\\")
37 CHART_BUILD_PLUGIN_DIR = $$replace(CHART_BUILD_PLUGIN_DIR, "/","\\")
37 CHART_BUILD_PLUGIN_DIR = $$replace(CHART_BUILD_PLUGIN_DIR, "/","\\")
38 CHART_BUILD_DOC_DIR = $$replace(CHART_BUILD_DOC_DIR, "/","\\")
38 CHART_BUILD_DOC_DIR = $$replace(CHART_BUILD_DOC_DIR, "/","\\")
39 CHART_BUILD_LIB_DIR = $$replace(CHART_BUILD_LIB_DIR, "/","\\")
39 CHART_BUILD_LIB_DIR = $$replace(CHART_BUILD_LIB_DIR, "/","\\")
40 }
40 }
41
41
42 mac: {
42 mac: {
43 # TODO: The following qmake flags are a work-around to make QtCommercial Charts compile on
43 # TODO: The following qmake flags are a work-around to make QtCommercial Charts compile on
44 # QtCommercial 4.8. On the other hand Charts builds successfully with Qt open source 4.8
44 # QtCommercial 4.8. On the other hand Charts builds successfully with Qt open source 4.8
45 # without these definitions, so this is probably a configuration issue on QtCommercial 4.8;
45 # without these definitions, so this is probably a configuration issue on QtCommercial 4.8;
46 # it should probably define the minimum OSX version to be 10.5...
46 # it should probably define the minimum OSX version to be 10.5...
47 QMAKE_CXXFLAGS *= -mmacosx-version-min=10.5
47 QMAKE_CXXFLAGS *= -mmacosx-version-min=10.5
48 QMAKE_LFLAGS *= -mmacosx-version-min=10.5
48 QMAKE_LFLAGS *= -mmacosx-version-min=10.5
49 }
49 }
50
50
51 ##################### DEVELOPMENT BUILD ###################################################
51 ##################### DEVELOPMENT BUILD ###################################################
52
52
53 development_build: {
53 development_build: {
54 DEFINES+=DEVELOPMENT_BUILD
54 DEFINES+=DEVELOPMENT_BUILD
55 CONFIG+=debug_and_release
55 CONFIG+=debug_and_release
56 }
56 }
57
57
58
58
59 ##################### BUILD CONFIG ########################################################
59 ##################### BUILD CONFIG ########################################################
60
60
61 CONFIG(debug, debug|release) {
62 mac: LIBRARY_NAME = $$join(LIBRARY_NAME,,,_debug)
63 win32: LIBRARY_NAME = $$join(LIBRARY_NAME,,,d)
64 }
65
61 !system_build:{
66 !system_build:{
62
67
63 INCLUDEPATH += $$CHART_BUILD_PUBLIC_HEADER_DIR
68 INCLUDEPATH += $$CHART_BUILD_PUBLIC_HEADER_DIR
64
69
65 !win32: {
70 !win32: {
66 LIBS += -L $$CHART_BUILD_LIB_DIR -Wl,-rpath,$$CHART_BUILD_LIB_DIR
71 LIBS += -L $$CHART_BUILD_LIB_DIR -Wl,-rpath,$$CHART_BUILD_LIB_DIR
67 }else{
72 } else {
68 win32-msvc*: {
73 win32-msvc*: {
69 # hack fix for error:
74 # hack fix for error:
70 # "LINK : fatal error LNK1146: no argument specified with option '/LIBPATH:'"
75 # "LINK : fatal error LNK1146: no argument specified with option '/LIBPATH:'"
71 QMAKE_LIBDIR += $$CHART_BUILD_LIB_DIR
76 QMAKE_LIBDIR += $$CHART_BUILD_LIB_DIR
72 }else{
77 } else {
73 LIBS += -L $$CHART_BUILD_LIB_DIR
78 LIBS += -L $$CHART_BUILD_LIB_DIR
74 }
79 }
75 }
80 }
76
81
77 CONFIG(debug, debug|release) {
78 mac: LIBRARY_NAME = $$join(LIBRARY_NAME,,,_debug)
79 win32: LIBRARY_NAME = $$join(LIBRARY_NAME,,,d)
80 }
81
82 LIBS += -l$$LIBRARY_NAME
82 LIBS += -l$$LIBRARY_NAME
83 } else {
83 } else {
84 CONFIG += qtcommercialchart
84 CONFIG += qtcommercialchart
85 }
85 }
86
86
87 ##################### UNIT TESTS ##############################################################
87 ##################### UNIT TESTS ##############################################################
88
88
89 CONFIG(debug, debug|release) {
89 CONFIG(debug, debug|release) {
90 CONFIG+=test_private
90 CONFIG+=test_private
91 DEFINES+=BUILD_PRIVATE_UNIT_TESTS
91 DEFINES+=BUILD_PRIVATE_UNIT_TESTS
92 }
92 }
93
93
General Comments 0
You need to be logged in to leave comments. Login now