HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r994:96961d029820

1

integrated_build:{

1

integrated_build:{

2

INCLUDEPATH += $$CHART_BUILD_PUBLIC_HEADER_DIR

2

INCLUDEPATH += $$CHART_BUILD_PUBLIC_HEADER_DIR

3

4

!win32: {

4

!win32: {

5

LIBS += -L $$CHART_BUILD_LIB_DIR -Wl,-rpath,$$CHART_BUILD_LIB_DIR

5

LIBS += -L $$CHART_BUILD_LIB_DIR -Wl,-rpath,$$CHART_BUILD_LIB_DIR

6

}else{

6

}else{

7

win32-msvc*: {

7

win32-msvc*: {

8

# hack fix for error:

8

# hack fix for error:

9

# "LINK : fatal error LNK1146: no argument specified with option '/LIBPATH:'"

9

# "LINK : fatal error LNK1146: no argument specified with option '/LIBPATH:'"

10

QMAKE_LIBDIR += $$CHART_BUILD_LIB_DIR

10

QMAKE_LIBDIR += $$CHART_BUILD_LIB_DIR

11

}else{

11

}else{

12

LIBS += -L $$CHART_BUILD_LIB_DIR

12

LIBS += -L $$CHART_BUILD_LIB_DIR

13

}

13

}

14

}

14

}

15

16

CONFIG(debug, debug|release) {

16

CONFIG(debug, debug|release) {

17

LIBS += -lQtCommercialChartd

17

LIBS += -lQtCommercialChartd

18

#this is ugly hack to work around missing rpath, it simply copies lib

18

#this is ugly hack to work around missing rpath, it simply copies lib

19

win32:{

19

win32:{

20

copylib.target = $$CHART_BUILD_BIN_DIR/QtCommercialChartd.dll

20

copylib.target = $$CHART_BUILD_BIN_DIR/QtCommercialChartd.dll

21

copylib.commands = $$QMAKE_COPY $$CHART_BUILD_LIB_DIR\\QtCommercialChartd.dll $$CHART_BUILD_BIN_DIR

21

copylib.commands = $$QMAKE_COPY $$CHART_BUILD_LIB_DIR\\QtCommercialChartd.dll $$CHART_BUILD_BIN_DIR

22

copylib.depends = $$CHART_BUILD_LIB_DIR/QtCommercialChartd.dll

22

copylib.depends = $$CHART_BUILD_LIB_DIR/QtCommercialChartd.dll

23

PRE_TARGETDEPS += $$CHART_BUILD_BIN_DIR/QtCommercialChartd.dll

23

PRE_TARGETDEPS += $$CHART_BUILD_BIN_DIR/QtCommercialChartd.dll

24

QMAKE_EXTRA_TARGETS +=copylib

24

QMAKE_EXTRA_TARGETS +=copylib

25

}

25

}

26

} else {

26

} else {

27

LIBS += -lQtCommercialChart

27

LIBS += -lQtCommercialChart

28

29

#this is ugly hack to work around missing rpath, it simply copies lib

29

#this is ugly hack to work around missing rpath, it simply copies lib

30

win32: {

30

win32: {

31

copylib.target = $$CHART_BUILD_BIN_DIR/QtCommercialChart

31

copylib.target = $$CHART_BUILD_BIN_DIR/QtCommercialChart

32

copylib.commands = $$QMAKE_COPY $$CHART_BUILD_LIB_DIR\\QtCommercialChart.dll $$CHART_BUILD_BIN_DIR

32

copylib.commands = $$QMAKE_COPY $$CHART_BUILD_LIB_DIR\\QtCommercialChart.dll $$CHART_BUILD_BIN_DIR

33

copylib.depends = $$CHART_BUILD_LIB_DIR/QtCommercialChart.dll

33

copylib.depends = $$CHART_BUILD_LIB_DIR/QtCommercialChart.dll

34

PRE_TARGETDEPS += $$CHART_BUILD_BIN_DIR/QtCommercialChart

34

PRE_TARGETDEPS += $$CHART_BUILD_BIN_DIR/QtCommercialChart

35

QMAKE_EXTRA_TARGETS +=copylib

35

QMAKE_EXTRA_TARGETS +=copylib

36

}

36

}

37

}

37

}

38

39

mac: {

39

mac: {

40

# This is a hack to make binaries to use the internal version of the QtCommercial Charts library on OSX

40

# This is a hack to make binaries to use the internal version of the QtCommercial Charts library on OSX

41

CHARTS_LIB_NAME = libQtCommercialChart.1.dylib

41

CHARTS_LIB_NAME = libQtCommercialChart.1.dylib

42

CONFIG(debug, debug|release) {

42

CONFIG(debug, debug|release) {

43

CHARTS_LIB_NAME = libQtCommercialChartd.1.dylib

43

CHARTS_LIB_NAME = libQtCommercialChartd.1.dylib

44

}

44

}

45

BIN_TARGET_PATH = ""

45

BIN_TARGET_PATH = ""

46

exists ($$CHART_BUILD_BIN_DIR"/"$$TARGET".app/Contents/MacOS/"$$TARGET) {

46

exists ($$CHART_BUILD_BIN_DIR"/"$$TARGET".app/Contents/MacOS/"$$TARGET) {

47

BIN_TARGET_PATH = $$CHART_BUILD_BIN_DIR"/"$$TARGET".app/Contents/MacOS/"$$TARGET

47

BIN_TARGET_PATH = $$CHART_BUILD_BIN_DIR"/"$$TARGET".app/Contents/MacOS/"$$TARGET

48

}

48

}

49

exists ($$CHART_BUILD_BIN_DIR"/test/"$$TARGET".app/Contents/MacOS/"$$TARGET) {

49

exists ($$CHART_BUILD_BIN_DIR"/test/"$$TARGET".app/Contents/MacOS/"$$TARGET) {

50

# Executable in test folder

50

# Executable in test folder

51

BIN_TARGET_PATH = $$CHART_BUILD_BIN_DIR"/test/"$$TARGET".app/Contents/MacOS/"$$TARGET

51

BIN_TARGET_PATH = $$CHART_BUILD_BIN_DIR"/test/"$$TARGET".app/Contents/MacOS/"$$TARGET

52

}

52

}

53

exists ($$CHART_BUILD_BIN_DIR"/test/tst_"$$TARGET".app/Contents/MacOS/tst_"$$TARGET) {

53

exists ($$CHART_BUILD_BIN_DIR"/test/tst_"$$TARGET".app/Contents/MacOS/tst_"$$TARGET) {

54

# Executable in test folder with custom target "tst_NNN"

54

# Executable in test folder with custom target "tst_NNN"

55

BIN_TARGET_PATH = $$CHART_BUILD_BIN_DIR"/test/tst_"$$TARGET".app/Contents/MacOS/tst_"$$TARGET

55

BIN_TARGET_PATH = $$CHART_BUILD_BIN_DIR"/test/tst_"$$TARGET".app/Contents/MacOS/tst_"$$TARGET

56

}

56

}

57

exists($$CHART_BUILD_PLUGIN_DIR"/lib"$$TARGET".dylib") {

57

exists($$CHART_BUILD_PLUGIN_DIR"/lib"$$TARGET".dylib") {

58

# Plugin

58

# Plugin

59

BIN_TARGET_PATH = $$CHART_BUILD_PLUGIN_DIR"/lib"$$TARGET".dylib"

59

BIN_TARGET_PATH = $$CHART_BUILD_PLUGIN_DIR"/lib"$$TARGET".dylib"

60

}

60

}

61

!isEmpty (BIN_TARGET_PATH) {

61

!isEmpty (BIN_TARGET_PATH) {

62

QMAKE_POST_LINK += install_name_tool -change $$CHARTS_LIB_NAME $$CHART_BUILD_LIB_DIR"/"$$CHARTS_LIB_NAME $$BIN_TARGET_PATH

62

QMAKE_POST_LINK += install_name_tool -change $$CHARTS_LIB_NAME $$CHART_BUILD_LIB_DIR"/"$$CHARTS_LIB_NAME $$BIN_TARGET_PATH

63

# message($$QMAKE_POST_LINK)

63

# message($$QMAKE_POST_LINK)

64

} ~~else {~~

64

}

65

# Hack to make qml plugins available as internal build versions

65

66

exists($$CHART_BUILD_PLUGIN_DIR"/lib"$$TARGET".dylib") {

66

# Hack to make qml plugins available as internal build versions

67

QMAKE_POST_LINK += "& $$QMAKE_COPY qmldir $$CHART_BUILD_PLUGIN_DIR"

67

exists($$CHART_BUILD_PLUGIN_DIR"/lib"$$TARGET".dylib") {

68

# message($$QMAKE_POST_LINK)

68

QMAKE_POST_LINK += " & $$QMAKE_COPY qmldir $$CHART_BUILD_PLUGIN_DIR"

69

}

69

message($$QMAKE_POST_LINK)

70

}

70

}

71

}

71

}

72

73

} else {

73

} else {

74

CONFIG += qtcommercialchart

74

CONFIG += qtcommercialchart

75

}

75

}

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

             integrated_build:{
                 INCLUDEPATH += $$CHART_BUILD_PUBLIC_HEADER_DIR
                 !win32: {
                     LIBS += -L $$CHART_BUILD_LIB_DIR -Wl,-rpath,$$CHART_BUILD_LIB_DIR
                 }else{
                     win32-msvc*: {
                         # hack fix for error:
                         #   "LINK : fatal error LNK1146: no argument specified with option '/LIBPATH:'"
                         QMAKE_LIBDIR += $$CHART_BUILD_LIB_DIR
                     }else{
                         LIBS += -L $$CHART_BUILD_LIB_DIR
                     }
                 }
                 CONFIG(debug, debug|release) {
                     LIBS += -lQtCommercialChartd
                     #this is ugly hack to work around missing rpath, it simply copies lib
                     win32:{
                         copylib.target = $$CHART_BUILD_BIN_DIR/QtCommercialChartd.dll
                         copylib.commands = $$QMAKE_COPY $$CHART_BUILD_LIB_DIR\\QtCommercialChartd.dll $$CHART_BUILD_BIN_DIR
                         copylib.depends = $$CHART_BUILD_LIB_DIR/QtCommercialChartd.dll
                         PRE_TARGETDEPS += $$CHART_BUILD_BIN_DIR/QtCommercialChartd.dll
                         QMAKE_EXTRA_TARGETS +=copylib
                     }
                 } else {
                     LIBS += -lQtCommercialChart
                     #this is ugly hack to work around missing rpath, it simply copies lib
                     win32: {
                         copylib.target = $$CHART_BUILD_BIN_DIR/QtCommercialChart
                         copylib.commands = $$QMAKE_COPY $$CHART_BUILD_LIB_DIR\\QtCommercialChart.dll $$CHART_BUILD_BIN_DIR
                         copylib.depends = $$CHART_BUILD_LIB_DIR/QtCommercialChart.dll
                         PRE_TARGETDEPS += $$CHART_BUILD_BIN_DIR/QtCommercialChart
                         QMAKE_EXTRA_TARGETS +=copylib
                     }
                 }
                 mac: {
                     # This is a hack to make binaries to use the internal version of the QtCommercial Charts library on OSX
                     CHARTS_LIB_NAME = libQtCommercialChart.1.dylib
                     CONFIG(debug, debug|release) {
                         CHARTS_LIB_NAME = libQtCommercialChartd.1.dylib
                     }
                     BIN_TARGET_PATH = ""
                     exists ($$CHART_BUILD_BIN_DIR"/"$$TARGET".app/Contents/MacOS/"$$TARGET) {
                         BIN_TARGET_PATH = $$CHART_BUILD_BIN_DIR"/"$$TARGET".app/Contents/MacOS/"$$TARGET
                     }
                     exists ($$CHART_BUILD_BIN_DIR"/test/"$$TARGET".app/Contents/MacOS/"$$TARGET) {
                         # Executable in test folder
                         BIN_TARGET_PATH = $$CHART_BUILD_BIN_DIR"/test/"$$TARGET".app/Contents/MacOS/"$$TARGET
                     }
                     exists ($$CHART_BUILD_BIN_DIR"/test/tst_"$$TARGET".app/Contents/MacOS/tst_"$$TARGET) {
                         # Executable in test folder with custom target "tst_NNN"
                         BIN_TARGET_PATH = $$CHART_BUILD_BIN_DIR"/test/tst_"$$TARGET".app/Contents/MacOS/tst_"$$TARGET
                     }
                     exists($$CHART_BUILD_PLUGIN_DIR"/lib"$$TARGET".dylib") {
                         # Plugin
                         BIN_TARGET_PATH = $$CHART_BUILD_PLUGIN_DIR"/lib"$$TARGET".dylib"
                     }
                     !isEmpty (BIN_TARGET_PATH) {
                         QMAKE_POST_LINK += install_name_tool -change $$CHARTS_LIB_NAME $$CHART_BUILD_LIB_DIR"/"$$CHARTS_LIB_NAME $$BIN_TARGET_PATH
             #            message($$QMAKE_POST_LINK)
-                    } else {
-                        # Hack to make qml plugins available as internal build versions
-                        exists($$CHART_BUILD_PLUGIN_DIR"/lib"$$TARGET".dylib") {
+                    # Hack to make qml plugins available as internal build versions
-                            QMAKE_POST_LINK += "& $$QMAKE_COPY qmldir $$CHART_BUILD_PLUGIN_DIR"
+                    exists($$CHART_BUILD_PLUGIN_DIR"/lib"$$TARGET".dylib") {
-            #                message($$QMAKE_POST_LINK)
+                        QMAKE_POST_LINK += " & $$QMAKE_COPY qmldir $$CHART_BUILD_PLUGIN_DIR"
+                        message($$QMAKE_POST_LINK)
                     }
                 }
             } else {
                 CONFIG += qtcommercialchart
             }