diff --git a/common.pri b/common.pri index 41587c3..21b4285 100644 --- a/common.pri +++ b/common.pri @@ -3,7 +3,7 @@ CONFIG+=internal_build #remove if you want to build against installed libs CHART_BUILD_HEADER_DIR = $$PWD/include CHART_BUILD_LIB_DIR = $$PWD/lib CHART_BUILD_DIR = $$PWD/build -CHART_BUILD_BIN = $$PWD/bin +CHART_BUILD_BIN_DIR = $$PWD/bin # hack to fix windows builds diff --git a/internal.pri b/internal.pri index 3cc15c5..9afbf4a 100644 --- a/internal.pri +++ b/internal.pri @@ -2,16 +2,16 @@ internal_build:{ message('Internal build within charts core source tree') INCLUDEPATH += $$CHART_BUILD_HEADER_DIR LIBS += -L $$CHART_BUILD_LIB_DIR -Wl,-rpath,$$CHART_BUILD_LIB_DIR - DESTDIR = $$CHART_BUILD_BIN + DESTDIR = $$CHART_BUILD_BIN_DIR CONFIG(debug, debug|release) { LIBS += -lQtCommercialChartd #this is ugly hack to work around missing rpath, it simply copies lib win32:{ - copylib.target = QtCommercialChartd.dll + 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 += QtCommercialChartd.dll + PRE_TARGETDEPS += $$CHART_BUILD_BIN_DIR/QtCommercialChartd.dll QMAKE_EXTRA_TARGETS +=copylib } @@ -20,10 +20,10 @@ internal_build:{ #this is ugly hack to work around missing rpath, it simply copies lib win32:{ - copylib.target = QtCommercialChart + 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 += QtCommercialChart + PRE_TARGETDEPS += $$CHART_BUILD_BIN_DIR/QtCommercialChart QMAKE_EXTRA_TARGETS +=copylib } }