Attachment #425418 for bug #489558

View | Details | Raw Unified | Return to bug 489558
Collapse All | Expand All




    CImageViewer.cpp
    CMapRmp.cpp
    CMapDEMSlopeSetup.cpp
    IExchange.cpp
    CExchangeGarmin.cpp
    CExchangeTwoNav.cpp
)

if (WIN32)

    CMapRmp.h
    CMapDEMSlopeSetup.h
    QFileExt.h
    IExchange.h
    CExchangeGarmin.h
    CExchangeTwoNav.h
)





IF(DBUS)

  set(qlandkarte_include_dirs
    ${qlandkarte_include_dirs}
    ${QT_QTDBUS_INCLUDE_DIR}
    ${CMAKE_SOURCE_DIR}/3rdparty/SerialPort
  )


    add_definitions(-DHAS_DBUS)
    SET(qlandkarte_HDRS ${qlandkarte_HDRS}  CDBus.h)
    SET(qlandkarte_HDRS ${qlandkarte_HDRS}  IExchange.h)
    SET(qlandkarte_HDRS ${qlandkarte_HDRS}  CExchangeGarmin.h)
    SET(qlandkarte_HDRS ${qlandkarte_HDRS}  CExchangeTwoNav.h)

    SET(qlandkarte_SRCS ${qlandkarte_SRCS}  CDBus.cpp)
    SET(qlandkarte_SRCS ${qlandkarte_SRCS}  IExchange.cpp)
    SET(qlandkarte_SRCS ${qlandkarte_SRCS}  CExchangeGarmin.cpp)
    SET(qlandkarte_SRCS ${qlandkarte_SRCS}  CExchangeTwoNav.cpp)

    SET(qlandkarte_UIS ${qlandkarte_UIS})
ENDIF(DBUS)


  ${QT_QTSQL_INCLUDE_DIR}
  ${QT_QTOPENGL_INCLUDE_DIR}
  ${QT_QTNETWORK_INCLUDE_DIR}
  ${QT_QTDBUS_INCLUDE_DIR}
  ${QT_QTWEBKIT_INCLUDE_DIR}
  ${QT_QTSCRIPT_INCLUDE_DIR}
  ${QT_OPENGL_INCLUDE_DIR}

Return to bug 489558

Lines 277-285 Link Here

(-)a/src/CMakeLists.txt (-7 / +16 lines)
277	CImageViewer.cpp	277	CImageViewer.cpp
278	CMapRmp.cpp	278	CMapRmp.cpp
279	CMapDEMSlopeSetup.cpp	279	CMapDEMSlopeSetup.cpp
280	IExchange.cpp
281	CExchangeGarmin.cpp
282	CExchangeTwoNav.cpp
283	)	280	)
284		281
285	if (WIN32)	282	if (WIN32)
Lines 464-472 Link Here
464	CMapRmp.h	461	CMapRmp.h
465	CMapDEMSlopeSetup.h	462	CMapDEMSlopeSetup.h
466	QFileExt.h	463	QFileExt.h
467	IExchange.h
468	CExchangeGarmin.h
469	CExchangeTwoNav.h
470	)	464	)
471		465
472		466
Lines 595-603 Link Here
595		589
596		590
597	IF(DBUS)	591	IF(DBUS)
		592
		593	set(qlandkarte_include_dirs
		594	${qlandkarte_include_dirs}
		595	${QT_QTDBUS_INCLUDE_DIR}
		596	${CMAKE_SOURCE_DIR}/3rdparty/SerialPort
		597	)
		598
		599
598	add_definitions(-DHAS_DBUS)	600	add_definitions(-DHAS_DBUS)
599	SET(qlandkarte_HDRS ${qlandkarte_HDRS} CDBus.h)	601	SET(qlandkarte_HDRS ${qlandkarte_HDRS} CDBus.h)
		602	SET(qlandkarte_HDRS ${qlandkarte_HDRS} IExchange.h)
		603	SET(qlandkarte_HDRS ${qlandkarte_HDRS} CExchangeGarmin.h)
		604	SET(qlandkarte_HDRS ${qlandkarte_HDRS} CExchangeTwoNav.h)
		605
600	SET(qlandkarte_SRCS ${qlandkarte_SRCS} CDBus.cpp)	606	SET(qlandkarte_SRCS ${qlandkarte_SRCS} CDBus.cpp)
		607	SET(qlandkarte_SRCS ${qlandkarte_SRCS} IExchange.cpp)
		608	SET(qlandkarte_SRCS ${qlandkarte_SRCS} CExchangeGarmin.cpp)
		609	SET(qlandkarte_SRCS ${qlandkarte_SRCS} CExchangeTwoNav.cpp)
		610
601	SET(qlandkarte_UIS ${qlandkarte_UIS})	611	SET(qlandkarte_UIS ${qlandkarte_UIS})
602	ENDIF(DBUS)	612	ENDIF(DBUS)
603		613
Lines 678-684 Link Here
678	${QT_QTSQL_INCLUDE_DIR}	688	${QT_QTSQL_INCLUDE_DIR}
679	${QT_QTOPENGL_INCLUDE_DIR}	689	${QT_QTOPENGL_INCLUDE_DIR}
680	${QT_QTNETWORK_INCLUDE_DIR}	690	${QT_QTNETWORK_INCLUDE_DIR}
681	${QT_QTDBUS_INCLUDE_DIR}
682	${QT_QTWEBKIT_INCLUDE_DIR}	691	${QT_QTWEBKIT_INCLUDE_DIR}
683	${QT_QTSCRIPT_INCLUDE_DIR}	692	${QT_QTSCRIPT_INCLUDE_DIR}
684	${QT_OPENGL_INCLUDE_DIR}	693	${QT_OPENGL_INCLUDE_DIR}