HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r37:58ed1b062b4f

Fix compilation config for windows

Michal Klocek -

r37:58ed1b062b4f

parent child

Context file:

r37:58ed1b062b4f

Collapse all files

charts.pro +2 -1

             !include(common.pri) {
              error('missing common.pri')
             }
             TEMPLATE = subdirs
             SUBDIRS +=  src example test
             CONFIG += ordered
             QMAKE_CXXFLAGS += -g -Wall
-            QMAKE_DISTCLEAN += -r build bin
+            unix:QMAKE_DISTCLEAN += -r build bin
+            win32:QMAKE_DISTCLEAN += build bin
             # install feature file
             feature.path = $$[QT_INSTALL_DATA]/mkspecs/features
             feature.files = $$PWD/features/qtcommercialchart.prf
             INSTALLS += feature

common.pri +8 0

             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
+            # hack to fix windows builds
+            win32:{
+            CHART_BUILD_HEADER_DIR = $$replace(CHART_BUILD_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, "/","\\")
+            }

internal.pri +20 -1

@@ -1,13 +1,32
1	internal_build:{	1	internal_build:{
2	message('Internal build within charts core source tree')	2	message('Internal build within charts core source tree')
3	INCLUDEPATH += $$CHART_BUILD_HEADER_DIR	3	INCLUDEPATH += $$CHART_BUILD_HEADER_DIR
4	LIBS += -L $$CHART_BUILD_LIB_DIR -Wl,-rpath,$$CHART_BUILD_LIB_DIR	4	LIBS += -L $$CHART_BUILD_LIB_DIR -Wl,-rpath,$$CHART_BUILD_LIB_DIR
5	DESTDIR = $$CHART_BUILD_BIN	5	DESTDIR = $$CHART_BUILD_BIN
6	CONFIG(debug, debug\|release) {	6	CONFIG(debug, debug\|release) {
7	LIBS += -lQtCommercialChartd	7	LIBS += -lQtCommercialChartd
		8
		9	#this is ugly hack to work around missing rpath, it simply copies lib
		10	win32:{
		11	copylib.target = QtCommercialChartd.dll
		12	copylib.commands = $$QMAKE_COPY $$CHART_BUILD_LIB_DIR\QtCommercialChartd.dll $$CHART_BUILD_BIN_DIR
		13	copylib.depends = $$CHART_BUILD_LIB_DIR/QtCommercialChartd.dll
		14	PRE_TARGETDEPS += QtCommercialChartd.dll
		15	QMAKE_EXTRA_TARGETS +=copylib
		16	}
		17
8	} else {	18	} else {
9	LIBS += -lQtCommercialChart	19	LIBS += -lQtCommercialChart
		20
		21	#this is ugly hack to work around missing rpath, it simply copies lib
		22	win32:{
		23	copylib.target = QtCommercialChart
		24	copylib.commands = $$QMAKE_COPY $$CHART_BUILD_LIB_DIR\QtCommercialChart.dll $$CHART_BUILD_BIN_DIR
		25	copylib.depends = $$CHART_BUILD_LIB_DIR/QtCommercialChart.dll
		26	PRE_TARGETDEPS += QtCommercialChart
		27	QMAKE_EXTRA_TARGETS +=copylib
		28	}
10	}	29	}
11	}else{	30	}else{
12	CONFIG+=qtcommercialchart	31	CONFIG+=qtcommercialchart
13	}	32	}

src/src.pro +2 -1

             !include( ../common.pri ) {
             error( Couldn't find the common.pri file! )
             }
             TARGET = QtCommercialChart
             DESTDIR = $$CHART_BUILD_LIB_DIR
             TEMPLATE = lib
             QT += core \
                 gui
             CONFIG += debug_and_release
             CONFIG(debug, debug|release):TARGET = QtCommercialChartd
             SOURCES += \
                 xylinechart/qxychartseries.cpp \
                 xylinechart/xylinechartitem.cpp \
                 xylinechart/xygrid.cpp \
                 xylinechart/xyplotdomain.cpp \
                 qchart.cpp \
                 axis.cpp \
                 qchartwidget.cpp
             PRIVATE_HEADERS += \
                 xylinechart/xylinechartitem_p.h \
                 xylinechart/xyplotdomain_p.h \
                 xylinechart/xygrid_p.h \
                 axis_p.h
             PUBLIC_HEADERS += \
                 qchartseries.h \
                 qchart.h \
                 qchartwidget.h \
                 qchartglobal.h \
                 xylinechart/qxychartseries.h
             HEADERS += $$PUBLIC_HEADERS
             HEADERS += $$PRIVATE_HEADERS
             INCLUDEPATH += xylinechart \
                            .
             OBJECTS_DIR = $$CHART_BUILD_DIR/lib
             MOC_DIR = $$CHART_BUILD_DIR/lib
             UI_DIR = $$CHART_BUILD_DIR/lib
             RCC_DIR = $$CHART_BUILD_DIR/lib
             DEFINES += QTCOMMERCIALCHART_LIBRARY
             public_headers.path = $$[QT_INSTALL_HEADERS]/QtCommercialChart
             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 ${QMAKE_FILE_NAME} $$CHART_BUILD_HEADER_DIR
             install_build_headers.CONFIG += target_predeps no_link
             QMAKE_EXTRA_COMPILERS += install_build_headers
             chartversion.target = qchartversion_p.h
             chartversion.commands = @echo "build_time" > $$chartversion.target;
             chartversion.depends = $$HEADERS $$SOURCES
             PRE_TARGETDEPS += qchartversion_p.h
             QMAKE_CLEAN+= qchartversion_p.h
             QMAKE_EXTRA_TARGETS += chartversion
-            QMAKE_DISTCLEAN += -r $$CHART_BUILD_HEADER_DIR $$CHART_BUILD_LIB_DIR
  No newline at end of file
+            unix:QMAKE_DISTCLEAN += -r $$CHART_BUILD_HEADER_DIR $$CHART_BUILD_LIB_DIR
+            win32:QMAKE_DISTCLEAN += $$CHART_BUILD_HEADER_DIR $$CHART_BUILD_LIB_DIR
  No newline at end of file

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