diff --git a/charts.pro b/charts.pro index 18d71ab..de6f78c 100644 --- a/charts.pro +++ b/charts.pro @@ -3,7 +3,15 @@ } TEMPLATE = subdirs -SUBDIRS += src qmlplugin example test +SUBDIRS += src + +integrated_build:{ + message('Configured for integrated build') +SUBDIRS += example test qmlplugin +}else{ + message('Please build example test and qmlplugin after installing library.') +} + CONFIG += ordered QMAKE_CXXFLAGS += -g -Wall unix:QMAKE_DISTCLEAN += -r build bin diff --git a/common.pri b/common.pri index 38921c2..a37e6ba 100644 --- a/common.pri +++ b/common.pri @@ -1,13 +1,15 @@ CONFIG+=integrated_build #remove if you want to build against installed libs -CHART_BUILD_HEADER_DIR = $$PWD/include +CHART_BUILD_PUBLIC_HEADER_DIR = $$PWD/include +CHART_BUILD_PRIVATE_HEADER_DIR = $$CHART_BUILD_PUBLIC_HEADER_DIR/private CHART_BUILD_LIB_DIR = $$PWD/lib CHART_BUILD_DIR = $$PWD/build CHART_BUILD_BIN_DIR = $$PWD/bin # hack to fix windows builds win32:{ - CHART_BUILD_HEADER_DIR = $$replace(CHART_BUILD_HEADER_DIR, "/","\\") + CHART_BUILD_PUBLIC_HEADER_DIR = $$replace(CHART_BUILD_PUBLIC_HEADER_DIR, "/","\\") + CHART_BUILD_PRIVATE_HEADER_DIR = $$replace(CHART_BUILD_PRIVATE_HEADER_DIR, "/","\\") CHART_BUILD_LIB_DIR = $$replace(CHART_BUILD_LIB_DIR, "/","\\") CHART_BUILD_BUILD_DIR = $$replace(CHART_BUILD_BUILD_DIR, "/","\\") CHART_BUILD_BIN_DIR = $$replace(CHART_BUILD_BIN_DIR, "/","\\") diff --git a/integrated.pri b/integrated.pri index 8e154a1..6f3a977 100644 --- a/integrated.pri +++ b/integrated.pri @@ -1,6 +1,6 @@ integrated_build:{ - message('Internal build within charts core source tree') - INCLUDEPATH += $$CHART_BUILD_HEADER_DIR + message('Running integrated build against local libs...') + INCLUDEPATH += $$CHART_BUILD_PUBLIC_HEADER_DIR !win32: { LIBS += -L $$CHART_BUILD_LIB_DIR -Wl,-rpath,$$CHART_BUILD_LIB_DIR @@ -45,5 +45,6 @@ integrated_build:{ } } else { + message('Running build aginst system libs...') CONFIG+=qtcommercialchart } diff --git a/src/src.pro b/src/src.pro index 938da8f..28d8a48 100644 --- a/src/src.pro +++ b/src/src.pro @@ -89,15 +89,23 @@ public_headers.files = $$PUBLIC_HEADERS target.path = $$[QT_INSTALL_LIBS] INSTALLS += target \ public_headers -install_build_headers.name = bild_headers -install_build_headers.output = $$CHART_BUILD_HEADER_DIR/${QMAKE_FILE_BASE}.h -install_build_headers.input = PUBLIC_HEADERS -install_build_headers.commands = $$QMAKE_COPY \ +install_build_public_headers.name = bild_public_headers +install_build_public_headers.output = $$CHART_BUILD_PUBLIC_HEADER_DIR/${QMAKE_FILE_BASE}.h +install_build_public_headers.input = PUBLIC_HEADERS +install_build_public_headers.commands = $$QMAKE_COPY \ ${QMAKE_FILE_NAME} \ - $$CHART_BUILD_HEADER_DIR -install_build_headers.CONFIG += target_predeps \ + $$CHART_BUILD_PUBLIC_HEADER_DIR +install_build_public_headers.CONFIG += target_predeps \ no_link -QMAKE_EXTRA_COMPILERS += install_build_headers +install_build_private_headers.name = bild_private_headers +install_build_private_headers.output = $$CHART_BUILD_PRIVATE_HEADER_DIR/${QMAKE_FILE_BASE}.h +install_build_private_headers.input = PRIVATE_HEADERS +install_build_private_headers.commands = $$QMAKE_COPY \ + ${QMAKE_FILE_NAME} \ + $$CHART_BUILD_PRIVATE_HEADER_DIR +install_build_private_headers.CONFIG += target_predeps \ + no_link +QMAKE_EXTRA_COMPILERS += install_build_public_headers install_build_private_headers chartversion.target = qchartversion_p.h chartversion.commands = @echo \ "build_time" \