##// END OF EJS Templates
Really fixed build!
jeandet -
r9:b996b116b7be default
parent child
Show More
@@ -1,41 +1,42
1 #-------------------------------------------------
1 #-------------------------------------------------
2 #
2 #
3 # Project created by QtCreator 2015-06-11T21:37:25
3 # Project created by QtCreator 2015-06-11T21:37:25
4 #
4 #
5 #-------------------------------------------------
5 #-------------------------------------------------
6
6
7 QT += core gui opengl
7 QT += core gui opengl
8 CONFIG += qilib
8 CONFIG += qilib
9
9
10 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
10 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
11
11
12 TARGET = PCBView
12 TARGET = PCBView
13 TEMPLATE = app
13 TEMPLATE = app
14
14
15 MOC_DIR = moc
15 MOC_DIR = moc
16 RCC_DIR = resources
16 RCC_DIR = resources
17 OBJECTS_DIR = obj
17 OBJECTS_DIR = obj
18 DESTDIR = ../../bin
18 DESTDIR = ../../bin
19
19
20 INCLUDEPATH += ../../qilib $${DESTDIR}/../qilib/ $${DESTDIR}/../qilib/lispLike/
20 INCLUDEPATH += $$top_builddir/../../qilib \
21 $$top_srcdir/../../qilib
21
22
22 LIBS += -L../../bin -lQIlib
23 LIBS += -L../../bin -lQIlib
23
24
24 SOURCES += main.cpp\
25 SOURCES += main.cpp\
25 mainwindow.cpp \
26 mainwindow.cpp \
26 pcbgraphicview.cpp \
27 pcbgraphicview.cpp \
27 pcbrectpad.cpp \
28 pcbrectpad.cpp \
28 pcbmodule.cpp \
29 pcbmodule.cpp \
29 pcbline.cpp \
30 pcbline.cpp \
30 pcbcontext.cpp \
31 pcbcontext.cpp \
31 pcbvia.cpp
32 pcbvia.cpp
32
33
33 HEADERS += mainwindow.h \
34 HEADERS += mainwindow.h \
34 pcbgraphicview.h \
35 pcbgraphicview.h \
35 pcbrectpad.h \
36 pcbrectpad.h \
36 pcbmodule.h \
37 pcbmodule.h \
37 pcbline.h \
38 pcbline.h \
38 pcbcontext.h \
39 pcbcontext.h \
39 pcbvia.h
40 pcbvia.h
40
41
41 FORMS += mainwindow.ui
42 FORMS += mainwindow.ui
@@ -1,55 +1,55
1 QT += core gui
1 QT += core gui
2 CONFIG += qilib
2 CONFIG += qilib
3
3
4 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
4 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
5
5
6 TARGET = LispLikeDump
6 TARGET = LispLikeDump
7 TEMPLATE = app
7 TEMPLATE = app
8 MOC_DIR = moc
8 MOC_DIR = moc
9 RCC_DIR = resources
9 RCC_DIR = resources
10 OBJECTS_DIR = obj
10 OBJECTS_DIR = obj
11 DESTDIR = ../../bin
11 DESTDIR = ../../bin
12
12
13 SOURCES += main.cpp
13 SOURCES += main.cpp
14
14
15 INCLUDEPATH += ../../bin/../../qilib \
15 INCLUDEPATH += $$top_builddir/../../qilib \
16 ../../qilib
16 $$top_srcdir/../../qilib
17
17
18 message("top_builddir" $$top_builddir)
18 message("top_builddir" $$top_builddir)
19 message("top_srcdir" $$top_srcdir)
19 message("top_srcdir" $$top_srcdir)
20
20
21 LIBS += -L../../bin -lQIlib
21 LIBS += -L../../bin -lQIlib
22
22
23 FILESTOCOPY.files += \
23 FILESTOCOPY.files += \
24 $${PWD}/../testFiles/netlist1.net \
24 $${PWD}/../testFiles/netlist1.net \
25 $${PWD}/../testFiles/netlist2.net \
25 $${PWD}/../testFiles/netlist2.net \
26 $${PWD}/../testFiles/pcb1.kicad_pcb\
26 $${PWD}/../testFiles/pcb1.kicad_pcb\
27 $${PWD}/../testFiles/pcb2.kicad_pcb\
27 $${PWD}/../testFiles/pcb2.kicad_pcb\
28 $${PWD}/../testFiles/pcb3.kicad_pcb
28 $${PWD}/../testFiles/pcb3.kicad_pcb
29
29
30 FILESTOCOPY.path = $${DESTDIR}
30 FILESTOCOPY.path = $${DESTDIR}
31
31
32 message($${DESTDIR})
32 message($${DESTDIR})
33
33
34 defineTest(copyFiles) {
34 defineTest(copyFiles) {
35 files = $$1
35 files = $$1
36 DDIR = $$2
36 DDIR = $$2
37 win32:DDIR ~= s,/,\\,g
37 win32:DDIR ~= s,/,\\,g
38 QMAKE_POST_LINK += $$QMAKE_MKDIR $$quote($$DDIR) $$escape_expand(\\n\\t)
38 QMAKE_POST_LINK += $$QMAKE_MKDIR $$quote($$DDIR) $$escape_expand(\\n\\t)
39 for(FILE, files) {
39 for(FILE, files) {
40 message(copying file $$FILE to $$DIR)
40 message(copying file $$FILE to $$DIR)
41 # Replace slashes in paths with backslashes for Windows
41 # Replace slashes in paths with backslashes for Windows
42 win32:FILE ~= s,/,\\,g
42 win32:FILE ~= s,/,\\,g
43 QMAKE_POST_LINK += $$QMAKE_COPY $$quote($$FILE) $$quote($$DDIR) $$escape_expand(\\n\\t)
43 QMAKE_POST_LINK += $$QMAKE_COPY $$quote($$FILE) $$quote($$DDIR) $$escape_expand(\\n\\t)
44 }
44 }
45 export(QMAKE_POST_LINK)
45 export(QMAKE_POST_LINK)
46 }
46 }
47
47
48
48
49
49
50 !isEmpty(FILESTOCOPY.files) {
50 !isEmpty(FILESTOCOPY.files) {
51 copyFiles($$FILESTOCOPY.files,$$FILESTOCOPY.path)
51 copyFiles($$FILESTOCOPY.files,$$FILESTOCOPY.path)
52 }
52 }
53
53
54
54
55
55
General Comments 0
You need to be logged in to leave comments. Login now