HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1421:84c273c1c468

Fix name (id) of the installed library on OSX

Tero Ahola -

r1421:84c273c1c468

parent child

Context file:

r1421:84c273c1c468

config.pri 0 -2

                 # 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 ###################################################

src/src.pro +6 -1

             }
             mac: {
-                # Update the name (id) of the library on OSX to point to the lib dir
+                # Update the name (id) of the library on OSX to point to the lib path
                 MAC_CHARTS_LIB_NAME = "lib"$$LIBRARY_NAME".1.dylib"
                 QMAKE_POST_LINK += "install_name_tool -id $$CHART_BUILD_LIB_DIR"/"$$MAC_CHARTS_LIB_NAME $$CHART_BUILD_LIB_DIR"/"$$MAC_CHARTS_LIB_NAME"
+                # Update the name (id) of the installed library on OSX to point to the installation path
+                postinstall.path = $$[QT_INSTALL_LIBS]
+                postinstall.extra = "install_name_tool -id $$[QT_INSTALL_LIBS]"/"$$MAC_CHARTS_LIB_NAME $$[QT_INSTALL_LIBS]"/"$$MAC_CHARTS_LIB_NAME"
+                INSTALLS += postinstall
             }
             ################################ DEVELOPMENT BUILD ##########################################

General Comments 0

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

No TODOs yet

	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