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

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

Fixing OSX builds after test binary change
Tero Ahola -
r1141:7bef336cb7a1
parent child
Show More
Side by Side Unified
Context file:
r1141:7bef336cb7a1 Loading diff...:
Show file before | Show file after | Hide comments
@@ -1,111 +1,111
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 CHART_BUILD_LIB_DIR = $$CHART_BUILD_BIN_DIR
50 CHART_BUILD_LIB_DIR = $$CHART_BUILD_BIN_DIR
51 }
51 }
52
52
53 ##################### DEVELOPMENT BUILD ###################################################
53 ##################### DEVELOPMENT BUILD ###################################################
54
54
55 development_build: {
55 development_build: {
56 DEFINES+=DEVELOPMENT_BUILD
56 DEFINES+=DEVELOPMENT_BUILD
57 CONFIG+=debug_and_release
57 CONFIG+=debug_and_release
58 }
58 }
59
59
60
60
61 ##################### BUILD CONFIG ########################################################
61 ##################### BUILD CONFIG ########################################################
62
62
63 !system_build:{
63 !system_build:{
64
64
65 INCLUDEPATH += $$CHART_BUILD_PUBLIC_HEADER_DIR
65 INCLUDEPATH += $$CHART_BUILD_PUBLIC_HEADER_DIR
66
66
67 !win32: {
67 !win32: {
68 LIBS += -L $$CHART_BUILD_LIB_DIR -Wl,-rpath,$$CHART_BUILD_LIB_DIR
68 LIBS += -L $$CHART_BUILD_LIB_DIR -Wl,-rpath,$$CHART_BUILD_LIB_DIR
69 }else{
69 }else{
70 win32-msvc*: {
70 win32-msvc*: {
71 # hack fix for error:
71 # hack fix for error:
72 # "LINK : fatal error LNK1146: no argument specified with option '/LIBPATH:'"
72 # "LINK : fatal error LNK1146: no argument specified with option '/LIBPATH:'"
73 QMAKE_LIBDIR += $$CHART_BUILD_LIB_DIR
73 QMAKE_LIBDIR += $$CHART_BUILD_LIB_DIR
74 }else{
74 }else{
75 LIBS += -L $$CHART_BUILD_LIB_DIR
75 LIBS += -L $$CHART_BUILD_LIB_DIR
76 }
76 }
77 }
77 }
78
78
79 CONFIG(debug, debug|release) {
79 CONFIG(debug, debug|release) {
80 mac: LIBRARY_NAME = $$join(LIBRARY_NAME,,,_debug)
80 mac: LIBRARY_NAME = $$join(LIBRARY_NAME,,,_debug)
81 win32: LIBRARY_NAME = $$join(LIBRARY_NAME,,,d)
81 win32: LIBRARY_NAME = $$join(LIBRARY_NAME,,,d)
82 }
82 }
83
83
84 LIBS += -l$$LIBRARY_NAME
84 LIBS += -l$$LIBRARY_NAME
85
85
86 mac: {
86 mac: {
87 # This is a hack; we define variables for easier install_name_tool calls from project files of OSX executables/libraries
87 # This is a hack; we define variables for easier install_name_tool calls from project files of OSX executables/libraries
88 # install_name_tool is used to update the dependencies to chart library to match the local build folder
88 # install_name_tool is used to update the dependencies to chart library to match the local build folder
89 MAC_CHARTS_LIB_NAME = "lib"$$LIBRARY_NAME".1.dylib"
89 MAC_CHARTS_LIB_NAME = "lib"$$LIBRARY_NAME".1.dylib"
90 CONFIG(debug, debug|release) {
90 CONFIG(debug, debug|release) {
91 MAC_CHARTS_LIB_NAME = "lib"$$LIBRARY_NAME".1.dylib"
91 MAC_CHARTS_LIB_NAME = "lib"$$LIBRARY_NAME".1.dylib"
92 }
92 }
93 MAC_POST_LINK_PREFIX = install_name_tool -change $$MAC_CHARTS_LIB_NAME $$CHART_BUILD_LIB_DIR"/"$$MAC_CHARTS_LIB_NAME
93 MAC_POST_LINK_PREFIX = install_name_tool -change $$MAC_CHARTS_LIB_NAME $$CHART_BUILD_LIB_DIR"/"$$MAC_CHARTS_LIB_NAME
94 MAC_DEMOS_BIN_DIR = $$CHART_BUILD_BIN_DIR"/"$$TARGET".app/Contents/MacOS/"$$TARGET
94 MAC_DEMOS_BIN_DIR = $$CHART_BUILD_BIN_DIR"/"$$TARGET".app/Contents/MacOS/"$$TARGET
95 MAC_EXAMPLES_BIN_DIR = $$CHART_BUILD_BIN_DIR"/"$$TARGET".app/Contents/MacOS/"$$TARGET
95 MAC_EXAMPLES_BIN_DIR = $$CHART_BUILD_BIN_DIR"/"$$TARGET".app/Contents/MacOS/"$$TARGET
96 MAC_TESTS_BIN_DIR = $$CHART_BUILD_BIN_DIR"/test/"$$TARGET".app/Contents/MacOS/"$$TARGET
96 MAC_TESTS_BIN_DIR = $$CHART_BUILD_BIN_DIR"/"$$TARGET".app/Contents/MacOS/"$$TARGET
97 MAC_AUTOTESTS_BIN_DIR = $$CHART_BUILD_BIN_DIR"/test/tst_"$$TARGET".app/Contents/MacOS/tst_"$$TARGET
97 MAC_AUTOTESTS_BIN_DIR = $$CHART_BUILD_BIN_DIR"/tst_"$$TARGET".app/Contents/MacOS/tst_"$$TARGET
98 MAC_PLUGINS_BIN_DIR = $$CHART_BUILD_PLUGIN_DIR"/lib"$$TARGET".dylib"
98 MAC_PLUGINS_BIN_DIR = $$CHART_BUILD_PLUGIN_DIR"/lib"$$TARGET".dylib"
99 }
99 }
100
100
101 } else {
101 } else {
102 CONFIG += qtcommercialchart
102 CONFIG += qtcommercialchart
103 }
103 }
104
104
105 ##################### UNIT TESTS ##############################################################
105 ##################### UNIT TESTS ##############################################################
106
106
107 CONFIG(debug, debug|release) {
107 CONFIG(debug, debug|release) {
108 CONFIG+=test_private
108 CONFIG+=test_private
109 DEFINES+=BUILD_PRIVATE_UNIT_TESTS
109 DEFINES+=BUILD_PRIVATE_UNIT_TESTS
110 }
110 }
111
111
General Comments 0
You need to be logged in to leave comments. Login now