HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1035:94e302b01c45

Hacked library dependency issues on OSX

Tero Ahola -

r1035:94e302b01c45

parent child

Context file:

r1035:94e302b01c45

Expand all files

config.pri +10 -22

             LIBRARY_NAME = QtCommercialChart
             ##################### SHADOW CONFIG #################################################
             !contains($${PWD}, $${OUT_PWD}){
                 search = "$$PWD:::"
                 temp = $$split(search,"/")
                 temp = $$last(temp)
                 path = $$replace(search,$$temp,'')
                 temp = $$split(OUT_PWD,$$path)
                 temp = $$split(temp,'/')
                 temp = $$first(temp)
                 path = "$${path}$${temp}"
                 SHADOW=$$path
             }else{
                 SHADOW=$$PWD
                 CONFIG-=development_build
             }
             ##################### BUILD PATHS ##################################################
             CHART_BUILD_PUBLIC_HEADER_DIR = $$SHADOW/include
             CHART_BUILD_PRIVATE_HEADER_DIR = $$CHART_BUILD_PUBLIC_HEADER_DIR/private
             CHART_BUILD_LIB_DIR = $$SHADOW/lib
             CHART_BUILD_DIR = $$SHADOW/build
             CHART_BUILD_BIN_DIR = $$SHADOW/bin
             CHART_BUILD_PLUGIN_DIR = $$CHART_BUILD_BIN_DIR/QtCommercial/Chart
             CHART_BUILD_DOC_DIR = $$SHADOW/doc
             win32:{
                 CHART_BUILD_PUBLIC_HEADER_DIR = $$replace(CHART_BUILD_PUBLIC_HEADER_DIR, "/","\\")
                 CHART_BUILD_PRIVATE_HEADER_DIR = $$replace(CHART_BUILD_PRIVATE_HEADER_DIR, "/","\\")
                 CHART_BUILD_BUILD_DIR = $$replace(CHART_BUILD_BUILD_DIR, "/","\\")
                 CHART_BUILD_BIN_DIR = $$replace(CHART_BUILD_BIN_DIR, "/","\\")
                 CHART_BUILD_PLUGIN_DIR = $$replace(CHART_BUILD_PLUGIN_DIR, "/","\\")
                 CHART_BUILD_DOC_DIR = $$replace(CHART_BUILD_DOC_DIR, "/","\\")
                 CHART_BUILD_LIB_DIR = $$CHART_BUILD_BIN_DIR
             }
             mac: {
                 # TODO: The following qmake flags are a work-around to make QtCommercial Charts compile on
                 # QtCommercial 4.8. On the other hand Charts builds successfully with Qt open source 4.8
                 # without these definitions, so this is probably a configuration issue on QtCommercial 4.8;
                 # it should probably define the minimum OSX version to be 10.5...
                 QMAKE_CXXFLAGS *= -mmacosx-version-min=10.5
                 QMAKE_LFLAGS *= -mmacosx-version-min=10.5
                 CHART_BUILD_LIB_DIR = $$CHART_BUILD_BIN_DIR
             }
             ##################### DEVELOPMENT BUILD ###################################################
             development_build: {
                 DEFINES+=DEVELOPMENT_BUILD
                 CONFIG+=debug_and_release
             }
             ##################### BUILD CONFIG ########################################################
             !system_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) {
                   mac: LIBRARY_NAME = $$join(LIBRARY_NAME,,,_debug)
                   win32: LIBRARY_NAME = $$join(LIBRARY_NAME,,,d)
                 }
                 LIBS += -l$$LIBRARY_NAME
                 mac: {
-                    # This is a hack to make binaries to use the internal version of the QtCommercial Charts library on OSX
+                    # This is a hack; we define variables for easier install_name_tool calls from project files of OSX executables/libraries
-                    CHARTS_LIB_NAME = libQtCommercialChart.1.dylib
+                    # install_name_tool is used to update the dependencies to chart library to match the local build folder
+                    MAC_CHARTS_LIB_NAME = "lib"$$LIBRARY_NAME".1.dylib"
                     CONFIG(debug, debug|release) {
-                        CHARTS_LIB_NAME = libQtCommercialChartd.1.dylib
+                        MAC_CHARTS_LIB_NAME = "lib"$$LIBRARY_NAME".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
                     }
+                    MAC_POST_LINK_PREFIX = install_name_tool -change $$MAC_CHARTS_LIB_NAME $$CHART_BUILD_LIB_DIR"/"$$MAC_CHARTS_LIB_NAME
+                    MAC_DEMOS_BIN_DIR = $$CHART_BUILD_BIN_DIR"/"$$TARGET".app/Contents/MacOS/"$$TARGET
+                    MAC_EXAMPLES_BIN_DIR = $$CHART_BUILD_BIN_DIR"/"$$TARGET".app/Contents/MacOS/"$$TARGET
+                    MAC_TESTS_BIN_DIR = $$CHART_BUILD_BIN_DIR"/test/"$$TARGET".app/Contents/MacOS/"$$TARGET
+                    MAC_AUTOTESTS_BIN_DIR = $$CHART_BUILD_BIN_DIR"/test/tst_"$$TARGET".app/Contents/MacOS/tst_"$$TARGET
+                    MAC_PLUGINS_BIN_DIR = $$CHART_BUILD_PLUGIN_DIR"/lib"$$TARGET".dylib"
                 }
             } else {
                 CONFIG += qtcommercialchart
             }

demos/chartthemes/chartthemes.pro +8 0

@@ -1,4 +1,12
1	!include( ../demos.pri ):error( "Couldn't find the demos.pri file!" )	1	!include( ../demos.pri ):error( "Couldn't find the demos.pri file!" )
2	TARGET = chartthemes	2	TARGET = chartthemes
3	SOURCES = main.cpp themewidget.cpp	3	SOURCES = main.cpp themewidget.cpp
4	HEADERS = themewidget.h	4	HEADERS = themewidget.h
		5
		6	# This is a hack to make binaries to use the internal version of the QtCommercial Charts library on OSX
		7	#CHARTS_LIB_NAME = "lib"$$LIBRARY_NAME".1.dylib"
		8	#CONFIG(debug, debug\|release) {
		9	# CHARTS_LIB_NAME = "lib"$$LIBRARY_NAME".1.dylib"
		10	#}
		11
		12	mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_DEMOS_BIN_DIR"

demos/demos.pro +1 0

+            CURRENTLY_BUILDING_COMPONENTS = "demos"
             !include( ../config.pri ) {
                 error( "Couldn't find the config.pri file!" )
             }
             TEMPLATE = subdirs
             SUBDIRS += chartthemes \
                        piechartcustomization \
                        qmlchart \
                        dynamicspline

demos/dynamicspline/dynamicspline.pro +2 0

             !include( ../demos.pri ):error( "Couldn't find the demos.pri file!" )
             TARGET = dynamicspline
             HEADERS += chart.h
             SOURCES += main.cpp chart.cpp
+            mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_DEMOS_BIN_DIR"

demos/piechartcustomization/piechartcustomization.pro +1 0

             !include( ../demos.pri ) {
              error( "Couldn't find the demos.pri file!" )
             }
             TARGET = piechartcustomization
             SOURCES += main.cpp \
                 pentool.cpp \
                 brushtool.cpp \
                 customslice.cpp \
                 mainwidget.cpp
             HEADERS += \
                 pentool.h \
                 brushtool.h \
                 customslice.h \
                 mainwidget.h
+            mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_DEMOS_BIN_DIR"

demos/qmlchart/qmlchart.pro +1 0

             !include( ../demos.pri ) {
                 error( "Couldn't find the demos.pri file!" )
             }
             RESOURCES += resources.qrc
             SOURCES += main.cpp
             include(qmlapplicationviewer/qmlapplicationviewer.pri)
+            mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_DEMOS_BIN_DIR"

examples/areachart/areachart.pro +1 -2

             !include( ../examples.pri ) {
              error( "Couldn't find the examples.pri file!" )
             }
             TARGET = areachart
             SOURCES += main.cpp
+            mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR"

examples/barchart/barchart.pro +1 0

             !include( ../examples.pri ) {
              error( "Couldn't find the examples.pri file!" )
             }
             TARGET = barchart
             SOURCES += main.cpp
+            mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR"

examples/customchart/customchart.pro +1 -2

             !include( ../examples.pri ) {
              error( "Couldn't find the examples.pri file!" )
             }
             TARGET = customchart
             SOURCES += main.cpp
+            mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR"

examples/examples.pro +1 -8

+            CURRENTLY_BUILDING_COMPONENTS = "examples"
             !include( ../config.pri ) {
                 error( "Couldn't find the config.pri file!" )
             }
             TEMPLATE = subdirs
             SUBDIRS += \
                        areachart \
                        barchart \
                        customchart \
                        linechart \
                        percentbarchart \
                        piechart \
                        piechartdrilldown \
                        presenterchart \
                        scatterchart \
                        scatterinteractions \
                        splinechart \
                        stackedbarchart \
                        stackedbarchartdrilldown \
                        zoomlinechart \
                        modeldata

examples/linechart/linechart.pro +1 -2

             !include( ../examples.pri ) {
              error( "Couldn't find the examples.pri file!" )
             }
             TARGET = linechart
             SOURCES += main.cpp
+            mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR"

examples/modeldata/modeldata.pro +2 -6

-            #-------------------------------------------------
-            # Project created by QtCreator 2012-03-08T14:30:24
-            #-------------------------------------------------
             !include( ../examples.pri ) {
                 error( "Couldn't find the examples.pri file!" )
             }
             QT       += core gui
             TARGET = modeldata
             TEMPLATE = app
             SOURCES += main.cpp\
                     tablewidget.cpp \
                 customtablemodel.cpp
             HEADERS  += tablewidget.h \
                 customtablemodel.h
+            mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR"

examples/percentbarchart/percentbarchart.pro +1 0

             !include( ../examples.pri ) {
              error( "Couldn't find the examples.pri file!" )
             }
             TARGET = percentbarchart
             SOURCES += main.cpp
+            mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR"

examples/piechart/piechart.pro +1 -1

             !include( ../examples.pri ) {
              error( "Couldn't find the examples.pri file!" )
             }
             TARGET = piechart
             SOURCES += main.cpp
+            mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR"

examples/piechartdrilldown/piechartdrilldown.pro +1 0

             !include( ../examples.pri ) {
              error( "Couldn't find the examples.pri file!" )
             }
             TARGET = piechartdrilldown
             SOURCES += main.cpp \
                 drilldownslice.cpp \
                 drilldownchart.cpp
             HEADERS += \
                 drilldownchart.h \
                 drilldownslice.h
+            mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR"

examples/presenterchart/presenterchart.pro +2 0

             !include( ../examples.pri ) {
              error( "Couldn't find the examples.pri file!" )
             }
             TARGET = presenterchart
             HEADERS += chartview.h
             SOURCES += main.cpp chartview.cpp
+            mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR"

examples/scatterchart/scatterchart.pro +2 0

             !include( ../examples.pri ) {
                 error( "Couldn't find the examples.pri file!" )
             }
             TARGET = scatterchart
             SOURCES += main.cpp \
                 chartview.cpp
             HEADERS += \
                 chartview.h
+            mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR"

examples/scatterinteractions/scatterinteractions.pro +2 0

             !include( ../examples.pri ) {
                 error( "Couldn't find the examples.pri file!" )
             }
             TARGET = scatterinteractions
             SOURCES += main.cpp \
                 chartview.cpp
             HEADERS  += \
                 chartview.h
+            mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR"

examples/splinechart/splinechart.pro +1 -2

             !include( ../examples.pri ) {
              error( "Couldn't find the examples.pri file!" )
             }
             TARGET = splinechart
             SOURCES += main.cpp
+            mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR"

examples/stackedbarchart/stackedbarchart.pro +2 0

             !include( ../examples.pri ) {
              error( "Couldn't find the examples.pri file!" )
             }
             TARGET = stackedbarchart
             SOURCES += main.cpp
+            mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR"

examples/stackedbarchartdrilldown/stackedbarchartdrilldown.pro +1 0

             !include( ../examples.pri ) {
              error( "Couldn't find the examples.pri file!" )
             }
             TARGET = stackedbarchartdrilldown
             SOURCES += main.cpp drilldownseries.cpp drilldownchart.cpp
             HEADERS += drilldownseries.h drilldownchart.h
+            mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR"

examples/zoomlinechart/zoomlinechart.pro +1 -3

             !include( ../examples.pri ) {
              error( "Couldn't find the examples.pri file!" )
             }
             TARGET = zoomlinechart
             HEADERS += chartview.h
             SOURCES += main.cpp chartview.cpp
+            mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR"

qmlplugin/qmlplugin.pro +2 0

+            CURRENTLY_BUILDING_COMPONENTS = "qmlplugin"
             TEMPLATE = lib
             TARGET = qtcommercialchartqml
             CONFIG += qt plugin
             QT += declarative
             !include( ../config.pri ) {
                 error( "Couldn't find the config.pri file!" )
             }
             DESTDIR = $$CHART_BUILD_PLUGIN_DIR
             contains(QT_MAJOR_VERSION, 5) {
                 # TODO: QtQuick2 not supported by the implementation currently
                 DEFINES += QTQUICK2
             }
             OBJECTS_DIR = $$CHART_BUILD_DIR/plugin
             MOC_DIR = $$CHART_BUILD_DIR/plugin
             UI_DIR = $$CHART_BUILD_DIR/plugin
             RCC_DIR = $$CHART_BUILD_DIR/plugin
             SOURCES += \
                 plugin.cpp \
                 declarativechart.cpp \
                 declarativexyseries.cpp \
                 declarativexypoint.cpp \
                 declarativelineseries.cpp \
                 declarativesplineseries.cpp \
                 declarativeareaseries.cpp \
                 declarativescatterseries.cpp \
                 declarativepieseries.cpp \
                 declarativebarseries.cpp
             HEADERS += \
                 declarativechart.h \
                 declarativexyseries.h \
                 declarativexypoint.h \
                 declarativelineseries.h \
                 declarativesplineseries.h \
                 declarativeareaseries.h \
                 declarativescatterseries.h \
                 declarativepieseries.h \
                 declarativebarseries.h
             TARGETPATH = QtCommercial/Chart
             target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
             qmldir.files += $$PWD/qmldir
             qmldir.path +=  $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
             INSTALLS += target qmldir
             FILE = $$PWD/qmldir
             win32:{FILE = $$replace(FILE, "/","\\")}
             QMAKE_POST_LINK += $$QMAKE_COPY $$FILE $$CHART_BUILD_PLUGIN_DIR
+            mac: QMAKE_POST_LINK += " & $$MAC_POST_LINK_PREFIX $$MAC_PLUGINS_BIN_DIR"

test/auto/chartdataset/chartdataset.pro +3 0

             !include( ../auto.pri ) {
                 error( "Couldn't find the auto.pri file!" )
             }
             SOURCES += tst_chartdataset.cpp
+            mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_AUTOTESTS_BIN_DIR"

test/auto/domain/domain.pro +2 0

             !include( ../auto.pri ) {
                 error( "Couldn't find the auto.pri file!" )
             }
             SOURCES += tst_domain.cpp
+            mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_AUTOTESTS_BIN_DIR"

test/auto/qchart/qchart.pro +2 0

             !include( ../auto.pri ) {
                 error( "Couldn't find the auto.pri file!" )
             }
             SOURCES += tst_qchart.cpp
+            mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_AUTOTESTS_BIN_DIR"

test/auto/qchartview/qchartview.pro +2 0

             !include( ../auto.pri ) {
                 error( "Couldn't find the auto.pri file!" )
             }
             SOURCES += tst_qchartview.cpp
+            mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_AUTOTESTS_BIN_DIR"

test/chartwidgettest/chartwidgettest.pro +2 0

             !include( ../test.pri ) {
                 error( "Couldn't find the test.pri file!" )
             }
             TEMPLATE = app
             QT += core gui
             contains(QT_MAJOR_VERSION, 5) {
                 QT += widgets
             }
             SOURCES += main.cpp \
                 mainwidget.cpp \
                 dataseriedialog.cpp
             HEADERS += \
                 mainwidget.h \
                 dataseriedialog.h
+            mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_TESTS_BIN_DIR"

test/gdpbarchart/gdpbarchart.pro +2 0

             !include( ../test.pri ) {
                 error( "Couldn't find the test.pri file!" )
             }
             QT+= sql
             TARGET = gdpbarchart
             SOURCES += main.cpp\
                     widget.cpp
             HEADERS  += widget.h
             !mac {
                 FILE = $$PWD/gdpData
                 win32:{FILE = $$replace(FILE, "/","\\")}
                 DESTINATION = $$CHART_BUILD_BIN_DIR/test
                 win32:{DESTINATION = $$replace(DESTINATION, "/","\\")}
                 # TODO: QMAKE_POST_LINK does not work on mac; how to copy the data file?
                 QMAKE_POST_LINK += $$QMAKE_COPY $$FILE $$CHART_BUILD_BIN_DIR
             }
+            mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_TESTS_BIN_DIR"

test/tablemodelchart/tablemodelchart.pro +2 0

             !include( ../test.pri ) {
                 error( "Couldn't find the test.pri file!" )
             }
             QT       += core gui
             TARGET = tablemodelchart
             TEMPLATE = app
             SOURCES += main.cpp\
                     tablewidget.cpp \
                 customtablemodel.cpp
             HEADERS  += tablewidget.h \
                 customtablemodel.h
+            mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_TESTS_BIN_DIR"

test/wavechart/wavechart.pro +1 -2

             !include( ../test.pri ) {
              error( "Couldn't find the examples.pri file!" )
             }
             QT+=opengl
             TARGET = wavechart
             SOURCES += main.cpp wavechart.cpp
             HEADERS += wavechart.h
+            mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_TESTS_BIN_DIR"

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	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