##// END OF EJS Templates
Chages 'find' to 'contains' in src.pro to make windows linux build the same
Michal Klocek -
r711:431503c9e7b7
parent child
Show More
@@ -1,9 +1,7
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 SHADOW = $$find(OUT_PWD,$$PWD)
3 !contains($${PWD}, $${OUT_PWD}){
4
4 search = "$$PWD:::"
5 unix:isEmpty(SHADOW){
6 search = "$$PWD:::"
7 temp = $$split(search,"/")
5 temp = $$split(search,"/")
8 temp = $$last(temp)
6 temp = $$last(temp)
9 path = $$replace(search,$$temp,'')
7 path = $$replace(search,$$temp,'')
@@ -12,6 +10,8 unix:isEmpty(SHADOW){
12 temp = $$first(temp)
10 temp = $$first(temp)
13 path = "$${path}$${temp}"
11 path = "$${path}$${temp}"
14 SHADOW=$$path
12 SHADOW=$$path
13 }else{
14 SHADOW=$$PWD
15 }
15 }
16
16
17 CHART_BUILD_PUBLIC_HEADER_DIR = $$SHADOW/include
17 CHART_BUILD_PUBLIC_HEADER_DIR = $$SHADOW/include
@@ -9,6 +9,9 SOURCES += main.cpp\
9 HEADERS += widget.h
9 HEADERS += widget.h
10
10
11 !mac {
11 !mac {
12 DIR = $$PWD
13
14 win32:{DIR = $$replace(DIR, "/","\\")}
12 # TODO: QMAKE_POST_LINK does not work on mac; how to copy the data file?
15 # TODO: QMAKE_POST_LINK does not work on mac; how to copy the data file?
13 QMAKE_POST_LINK += $$QMAKE_COPY $$PWD/gdpData $$CHART_BUILD_BIN_DIR
16 QMAKE_POST_LINK += $$QMAKE_COPY $$DIR/gdpData $$CHART_BUILD_BIN_DIR
14 }
17 }
@@ -62,9 +62,15 DEFINES += QTCOMMERCIALCHART_LIBRARY
62
62
63 #qt public headers
63 #qt public headers
64 #this is very primitive and lame parser , TODO: make perl script insted
64 #this is very primitive and lame parser , TODO: make perl script insted
65 !exists($$CHART_BUILD_PUBLIC_HEADER_DIR)
65 !exists($$CHART_BUILD_PUBLIC_HEADER_DIR/QChartGlobal)
66 {
66 {
67 system($$QMAKE_MKDIR $$CHART_BUILD_PUBLIC_HEADER_DIR)
67 system($$QMAKE_MKDIR $$CHART_BUILD_PUBLIC_HEADER_DIR)
68 win32:{
69 command = "echo $${LITERAL_HASH}include \"qchartglobal.h\" > $$CHART_BUILD_PUBLIC_HEADER_DIR/QChartGlobal"
70 }else{
71 command = "echo \"$${LITERAL_HASH}include \\\"qchartglobal.h\\\"\" > $$CHART_BUILD_PUBLIC_HEADER_DIR/QChartGlobal"
72 }
73 system($$command)
68 }
74 }
69
75
70 for(file, PUBLIC_HEADERS) {
76 for(file, PUBLIC_HEADERS) {
General Comments 0
You need to be logged in to leave comments. Login now