##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » USERS » JEANDET » PythonQt
RSS
Updated build scripts, now everything builds.
Jeandet Alexis -
r9:2b3d939ebb38 default
parent child
Show More
Show file before | Show file after | Hide comments
@@ -1,7 +1,7
1 TEMPLATE = subdirs
1 TEMPLATE = subdirs
2
2
3 CONFIG += ordered
3 CONFIG += ordered
4 SUBDIRS = src extensions #tests examples
4 SUBDIRS = src extensions tests examples
5
5
6 contains(QT_MAJOR_VERSION, 5) {
6 contains(QT_MAJOR_VERSION, 5) {
7 SUBDIRS += generator_50
7 SUBDIRS += generator_50
Show file before | Show file after | Hide comments
@@ -96,3 +96,11 contains(CONFIG,BUILDING_QTALL){
96
96
97
97
98
98
99 contains(CONFIG,BUILDING_EXAMPLES){
100 message("BUILDING_EXAMPLES")
101 LIBS += -L$${DESTDIR}
102 LIBS += -lPythonQt_QtAll$${DEBUG_EXT}
103 LIBS += -lPythonQt$${DEBUG_EXT}
104 INCLUDEPATH += $${PWD}/../src \
105 $${PWD}/../extensions/PythonQt_QtAll
106 }
Show file before | Show file after | Hide comments
@@ -11,8 +11,7 contains(QT_MAJOR_VERSION, 5) {
11 }
11 }
12
12
13
13
14 include ( ../../build/common.prf )
14 CONFIG+=BUILDING_EXAMPLES
15 CONFIG+=BUILDING_QTALL
16 include ( ../../build/pythonqt.prf )
15 include ( ../../build/pythonqt.prf )
17
16
18 SOURCES += \
17 SOURCES += \
Show file before | Show file after | Hide comments
@@ -9,11 +9,8 contains(QT_MAJOR_VERSION, 5) {
9
9
10 mac:CONFIG-= app_bundle
10 mac:CONFIG-= app_bundle
11
11
12 include ( ../../build/common.prf )
12 CONFIG+=BUILDING_EXAMPLES
13 CONFIG+=BUILDING_QTALL
14 include ( ../../build/pythonqt.prf )
13 include ( ../../build/pythonqt.prf )
15 include ( ../../build/PythonQt_QtAll.prf )
16
17
14
18 HEADERS += \
15 HEADERS += \
19 SimpleConsole.h \
16 SimpleConsole.h \
Show file before | Show file after | Hide comments
@@ -13,8 +13,7 contains(QT_MAJOR_VERSION, 5) {
13 QT += widgets
13 QT += widgets
14 }
14 }
15
15
16 include ( ../../build/common.prf )
16 CONFIG+=BUILDING_EXAMPLES
17 CONFIG+=BUILDING_QTALL
18 include ( ../../build/pythonqt.prf )
17 include ( ../../build/pythonqt.prf )
19
18
20 HEADERS += \
19 HEADERS += \
Show file before | Show file after | Hide comments
@@ -13,9 +13,9 contains(QT_MAJOR_VERSION, 5) {
13 QT += widgets
13 QT += widgets
14 }
14 }
15
15
16 include ( ../../build/common.prf )
16 CONFIG+=BUILDING_EXAMPLES
17 include ( ../../build/PythonQt.prf )
17 include ( ../../build/pythonqt.prf )
18
18
19
19
20 HEADERS += \
20 HEADERS += \
21 CustomObject.h
21 CustomObject.h
Show file before | Show file after | Hide comments
@@ -9,9 +9,9 TEMPLATE = app
9
9
10 DESTDIR = ../../lib
10 DESTDIR = ../../lib
11
11
12 include ( ../../build/common.prf )
12 CONFIG+=BUILDING_EXAMPLES
13 CONFIG+=BUILDING_QTALL
13 include ( ../../build/pythonqt.prf )
14 include ( ../../build/pythonqt.prf )
14
15
15
16 contains(QT_MAJOR_VERSION, 5) {
16 contains(QT_MAJOR_VERSION, 5) {
17 QT += widgets
17 QT += widgets
Show file before | Show file after | Hide comments
@@ -15,10 +15,11 contains(QT_MAJOR_VERSION, 5) {
15 QT += widgets
15 QT += widgets
16 }
16 }
17
17
18 include ( ../../build/common.prf )
18 CONFIG+=BUILDING_EXAMPLES
19 CONFIG+=BUILDING_QTALL
20 include ( ../../build/pythonqt.prf )
19 include ( ../../build/pythonqt.prf )
21
20
21
22
22 SOURCES += \
23 SOURCES += \
23 main.cpp
24 main.cpp
24
25
Show file before | Show file after | Hide comments
@@ -16,10 +16,9 contains(QT_MAJOR_VERSION, 5) {
16 }
16 }
17
17
18
18
19 include ( ../../build/common.prf )
19 CONFIG+=BUILDING_EXAMPLES
20 CONFIG+=BUILDING_QTALL
21 include ( ../../build/pythonqt.prf )
20 include ( ../../build/pythonqt.prf )
22 include ( ../../build/PythonQt_QtAll.prf )
21
23
22
24 SOURCES += \
23 SOURCES += \
25 main.cpp
24 main.cpp
Show file before | Show file after | Hide comments
@@ -15,10 +15,9 contains(QT_MAJOR_VERSION, 5) {
15 QT += widgets
15 QT += widgets
16 }
16 }
17
17
18 include ( ../../build/common.prf )
18 CONFIG+=BUILDING_EXAMPLES
19 CONFIG+=BUILDING_QTALL
19 include ( ../../build/pythonqt.prf )
20 include ( ../../build/pythonqt.prf )
20
21 include ( ../../build/PythonQt_QtAll.prf )
22
21
23 SOURCES += \
22 SOURCES += \
24 main.cpp
23 main.cpp
Show file before | Show file after | Hide comments
@@ -15,10 +15,9 contains(QT_MAJOR_VERSION, 5) {
15
15
16 mac:CONFIG-= app_bundle
16 mac:CONFIG-= app_bundle
17
17
18 include ( ../../build/common.prf )
18 CONFIG+=BUILDING_EXAMPLES
19 CONFIG+=BUILDING_QTALL
20 include ( ../../build/pythonqt.prf )
19 include ( ../../build/pythonqt.prf )
21 include ( ../../build/PythonQt_QtAll.prf )
20
22
21
23 HEADERS += \
22 HEADERS += \
24 PyExampleObject.h
23 PyExampleObject.h
Show file before | Show file after | Hide comments
@@ -13,9 +13,9 mac {
13
13
14 QT += testlib
14 QT += testlib
15
15
16 include ( ../build/common.prf )
17 CONFIG+=BUILDING_QTALL
16 CONFIG+=BUILDING_QTALL
18 include ( ../build/pythonqt.prf )
17 include ( ../build/pythonqt.prf )
18 INCLUDEPATH += ../src
19
19
20 contains(QT_MAJOR_VERSION, 5) {
20 contains(QT_MAJOR_VERSION, 5) {
21 QT += widgets
21 QT += widgets
General Comments 0
You need to be logged in to leave comments. Login now