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

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

minor. put back old build path
Michal Klocek -
r1042:af91f687e8f2
parent child
Show More
Side by Side Unified
Context file:
r1042:af91f687e8f2 Loading diff...:
Show file before | Show file after | Hide comments
@@ -1,102 +1,102
1
1
2 LIBRARY_NAME = QtCommercialChart
2 LIBRARY_NAME = QtCommercialChart
3
3
4 ##################### SHADOW CONFIG #################################################
4 ##################### SHADOW CONFIG #################################################
5
5
6 !contains($${PWD}, $${OUT_PWD}){
6 !contains($${PWD}, $${OUT_PWD}){
7 search = "$$PWD:::"
7 search = "$$PWD:::"
8 temp = $$split(search,"/")
8 temp = $$split(search,"/")
9 temp = $$last(temp)
9 temp = $$last(temp)
10 path = $$replace(search,$$temp,'')
10 path = $$replace(search,$$temp,'')
11 temp = $$split(OUT_PWD,$$path)
11 temp = $$split(OUT_PWD,$$path)
12 temp = $$split(temp,'/')
12 temp = $$split(temp,'/')
13 temp = $$first(temp)
13 temp = $$first(temp)
14 path = "$${path}$${temp}"
14 path = "$${path}$${temp}"
15 SHADOW=$$path
15 SHADOW=$$path
16 }else{
16 }else{
17 SHADOW=$$PWD
17 SHADOW=$$PWD
18 CONFIG-=development_build
18 CONFIG-=development_build
19 }
19 }
20
20
21 ##################### BUILD PATHS ##################################################
21 ##################### BUILD PATHS ##################################################
22
22
23 CHART_BUILD_PUBLIC_HEADER_DIR = $$SHADOW/include
23 CHART_BUILD_PUBLIC_HEADER_DIR = $$SHADOW/include
24 CHART_BUILD_PRIVATE_HEADER_DIR = $$CHART_BUILD_PUBLIC_HEADER_DIR/private
24 CHART_BUILD_PRIVATE_HEADER_DIR = $$CHART_BUILD_PUBLIC_HEADER_DIR/private
25 CHART_BUILD_LIB_DIR = $$SHADOW/lib
25 CHART_BUILD_LIB_DIR = $$SHADOW/lib
26 CHART_BUILD_DIR = $$SHADOW/build
26 CHART_BUILD_DIR = $$SHADOW/build
27 CHART_BUILD_BIN_DIR = $$SHADOW/bin
27 CHART_BUILD_BIN_DIR = $$SHADOW/bin
28 CHART_BUILD_PLUGIN_DIR = $$CHART_BUILD_BIN_DIR/QtCommercial/Chart
28 CHART_BUILD_PLUGIN_DIR = $$CHART_BUILD_BIN_DIR/QtCommercial/Chart
29 CHART_BUILD_DOC_DIR = $$SHADOW/doc
29 CHART_BUILD_DOC_DIR = $$SHADOW/doc
30
30
31 win32:{
31 win32:{
32 CHART_BUILD_PUBLIC_HEADER_DIR = $$replace(CHART_BUILD_PUBLIC_HEADER_DIR, "/","\\")
32 CHART_BUILD_PUBLIC_HEADER_DIR = $$replace(CHART_BUILD_PUBLIC_HEADER_DIR, "/","\\")
33 CHART_BUILD_PRIVATE_HEADER_DIR = $$replace(CHART_BUILD_PRIVATE_HEADER_DIR, "/","\\")
33 CHART_BUILD_PRIVATE_HEADER_DIR = $$replace(CHART_BUILD_PRIVATE_HEADER_DIR, "/","\\")
34 CHART_BUILD_BUILD_DIR = $$replace(CHART_BUILD_BUILD_DIR, "/","\\")
34 CHART_BUILD_BUILD_DIR = $$replace(CHART_BUILD_BUILD_DIR, "/","\\")
35 CHART_BUILD_BIN_DIR = $$replace(CHART_BUILD_BIN_DIR, "/","\\")
35 CHART_BUILD_BIN_DIR = $$replace(CHART_BUILD_BIN_DIR, "/","\\")
36 CHART_BUILD_PLUGIN_DIR = $$replace(CHART_BUILD_PLUGIN_DIR, "/","\\")
36 CHART_BUILD_PLUGIN_DIR = $$replace(CHART_BUILD_PLUGIN_DIR, "/","\\")
37 CHART_BUILD_DOC_DIR = $$replace(CHART_BUILD_DOC_DIR, "/","\\")
37 CHART_BUILD_DOC_DIR = $$replace(CHART_BUILD_DOC_DIR, "/","\\")
38 CHART_BUILD_LIB_DIR = $$CHART_BUILD_BIN_DIR
38 CHART_BUILD_LIB_DIR = $$replace(CHART_BUILD_LIB_DIR, "/","\\")
39 }
39 }
40
40
41 mac: {
41 mac: {
42 # TODO: The following qmake flags are a work-around to make QtCommercial Charts compile on
42 # TODO: The following qmake flags are a work-around to make QtCommercial Charts compile on
43 # QtCommercial 4.8. On the other hand Charts builds successfully with Qt open source 4.8
43 # QtCommercial 4.8. On the other hand Charts builds successfully with Qt open source 4.8
44 # without these definitions, so this is probably a configuration issue on QtCommercial 4.8;
44 # without these definitions, so this is probably a configuration issue on QtCommercial 4.8;
45 # it should probably define the minimum OSX version to be 10.5...
45 # it should probably define the minimum OSX version to be 10.5...
46 QMAKE_CXXFLAGS *= -mmacosx-version-min=10.5
46 QMAKE_CXXFLAGS *= -mmacosx-version-min=10.5
47 QMAKE_LFLAGS *= -mmacosx-version-min=10.5
47 QMAKE_LFLAGS *= -mmacosx-version-min=10.5
48
48
49 CHART_BUILD_LIB_DIR = $$CHART_BUILD_BIN_DIR
49 CHART_BUILD_LIB_DIR = $$CHART_BUILD_BIN_DIR
50 }
50 }
51
51
52 ##################### DEVELOPMENT BUILD ###################################################
52 ##################### DEVELOPMENT BUILD ###################################################
53
53
54 development_build: {
54 development_build: {
55 DEFINES+=DEVELOPMENT_BUILD
55 DEFINES+=DEVELOPMENT_BUILD
56 CONFIG+=debug_and_release
56 CONFIG+=debug_and_release
57 }
57 }
58
58
59
59
60 ##################### BUILD CONFIG ########################################################
60 ##################### BUILD CONFIG ########################################################
61
61
62 !system_build:{
62 !system_build:{
63
63
64 INCLUDEPATH += $$CHART_BUILD_PUBLIC_HEADER_DIR
64 INCLUDEPATH += $$CHART_BUILD_PUBLIC_HEADER_DIR
65
65
66 !win32: {
66 !win32: {
67 LIBS += -L $$CHART_BUILD_LIB_DIR -Wl,-rpath,$$CHART_BUILD_LIB_DIR
67 LIBS += -L $$CHART_BUILD_LIB_DIR -Wl,-rpath,$$CHART_BUILD_LIB_DIR
68 }else{
68 }else{
69 win32-msvc*: {
69 win32-msvc*: {
70 # hack fix for error:
70 # hack fix for error:
71 # "LINK : fatal error LNK1146: no argument specified with option '/LIBPATH:'"
71 # "LINK : fatal error LNK1146: no argument specified with option '/LIBPATH:'"
72 QMAKE_LIBDIR += $$CHART_BUILD_LIB_DIR
72 QMAKE_LIBDIR += $$CHART_BUILD_LIB_DIR
73 }else{
73 }else{
74 LIBS += -L $$CHART_BUILD_LIB_DIR
74 LIBS += -L $$CHART_BUILD_LIB_DIR
75 }
75 }
76 }
76 }
77
77
78 CONFIG(debug, debug|release) {
78 CONFIG(debug, debug|release) {
79 mac: LIBRARY_NAME = $$join(LIBRARY_NAME,,,_debug)
79 mac: LIBRARY_NAME = $$join(LIBRARY_NAME,,,_debug)
80 win32: LIBRARY_NAME = $$join(LIBRARY_NAME,,,d)
80 win32: LIBRARY_NAME = $$join(LIBRARY_NAME,,,d)
81 }
81 }
82
82
83 LIBS += -l$$LIBRARY_NAME
83 LIBS += -l$$LIBRARY_NAME
84
84
85 mac: {
85 mac: {
86 # This is a hack; we define variables for easier install_name_tool calls from project files of OSX executables/libraries
86 # This is a hack; we define variables for easier install_name_tool calls from project files of OSX executables/libraries
87 # install_name_tool is used to update the dependencies to chart library to match the local build folder
87 # install_name_tool is used to update the dependencies to chart library to match the local build folder
88 MAC_CHARTS_LIB_NAME = "lib"$$LIBRARY_NAME".1.dylib"
88 MAC_CHARTS_LIB_NAME = "lib"$$LIBRARY_NAME".1.dylib"
89 CONFIG(debug, debug|release) {
89 CONFIG(debug, debug|release) {
90 MAC_CHARTS_LIB_NAME = "lib"$$LIBRARY_NAME".1.dylib"
90 MAC_CHARTS_LIB_NAME = "lib"$$LIBRARY_NAME".1.dylib"
91 }
91 }
92 MAC_POST_LINK_PREFIX = install_name_tool -change $$MAC_CHARTS_LIB_NAME $$CHART_BUILD_LIB_DIR"/"$$MAC_CHARTS_LIB_NAME
92 MAC_POST_LINK_PREFIX = install_name_tool -change $$MAC_CHARTS_LIB_NAME $$CHART_BUILD_LIB_DIR"/"$$MAC_CHARTS_LIB_NAME
93 MAC_DEMOS_BIN_DIR = $$CHART_BUILD_BIN_DIR"/"$$TARGET".app/Contents/MacOS/"$$TARGET
93 MAC_DEMOS_BIN_DIR = $$CHART_BUILD_BIN_DIR"/"$$TARGET".app/Contents/MacOS/"$$TARGET
94 MAC_EXAMPLES_BIN_DIR = $$CHART_BUILD_BIN_DIR"/"$$TARGET".app/Contents/MacOS/"$$TARGET
94 MAC_EXAMPLES_BIN_DIR = $$CHART_BUILD_BIN_DIR"/"$$TARGET".app/Contents/MacOS/"$$TARGET
95 MAC_TESTS_BIN_DIR = $$CHART_BUILD_BIN_DIR"/test/"$$TARGET".app/Contents/MacOS/"$$TARGET
95 MAC_TESTS_BIN_DIR = $$CHART_BUILD_BIN_DIR"/test/"$$TARGET".app/Contents/MacOS/"$$TARGET
96 MAC_AUTOTESTS_BIN_DIR = $$CHART_BUILD_BIN_DIR"/test/tst_"$$TARGET".app/Contents/MacOS/tst_"$$TARGET
96 MAC_AUTOTESTS_BIN_DIR = $$CHART_BUILD_BIN_DIR"/test/tst_"$$TARGET".app/Contents/MacOS/tst_"$$TARGET
97 MAC_PLUGINS_BIN_DIR = $$CHART_BUILD_PLUGIN_DIR"/lib"$$TARGET".dylib"
97 MAC_PLUGINS_BIN_DIR = $$CHART_BUILD_PLUGIN_DIR"/lib"$$TARGET".dylib"
98 }
98 }
99
99
100 } else {
100 } else {
101 CONFIG += qtcommercialchart
101 CONFIG += qtcommercialchart
102 }
102 }
General Comments 0
You need to be logged in to leave comments. Login now