summaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorjjl2010-09-23 04:41:19 +0200
committerjjl2010-09-23 04:41:19 +0200
commitda5372e49f47271f000d1f51887a93556fd0cda2 (patch)
tree4628e2737614f2567bb6f71adfb69cba5c758641 /CMakeLists.txt
parent[PVSGUI] Turn on/off toolbar via menu and cmd-switch (pvsgui -h) (diff)
downloadpvs-da5372e49f47271f000d1f51887a93556fd0cda2.tar.gz
pvs-da5372e49f47271f000d1f51887a93556fd0cda2.tar.xz
pvs-da5372e49f47271f000d1f51887a93556fd0cda2.zip
[PVSGUI] Only one instance should be allowed now
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt16
1 files changed, 12 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f53422e..61574cf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,6 +37,12 @@ ELSEIF(UNIX)
ENDIF(WIN32)
################################################################################
+# Build third-party libraries
+################################################################################
+ADD_SUBDIRECTORY(3rdparty/qtsingleapplication)
+
+
+################################################################################
# Variables
################################################################################
@@ -92,6 +98,7 @@ SET( PVS_SRCS
# pvsgui
SET( PVSGUI_SRCS
+ ${QTSINGLEAPPLICATION_SRCS}
src/pvsgui.cpp
src/gui/clientConfigDialog.cpp
src/gui/clientFileSendDialog.cpp
@@ -184,6 +191,7 @@ SET( PVS_MOC_HDRS
)
SET( PVSGUI_MOC_HDRS
+ ${QTSINGLEAPPLICATION_MOC_HDRS}
src/pvsgui.h
src/gui/clientConfigDialog.h
src/gui/clientFileSendDialog.h
@@ -256,9 +264,9 @@ QT4_ADD_DBUS_ADAPTOR( PVS_SRCS ${CMAKE_BINARY_DIR}/org.openslx.pvs.xml src/pvs.h
QT4_ADD_DBUS_INTERFACE( PVSGUI_SRCS ${CMAKE_BINARY_DIR}/org.openslx.pvs.xml pvsinterface )
# i18n, run lupdate and lrelease)
-QT4_CREATE_TRANSLATION( PVSMGR_QMS ${PVSMGR_SRCS} ${PVSMGR_UI_HDRS} ${PVSMGR_TSS} )
-QT4_CREATE_TRANSLATION( PVS_QMS ${PVS_SRCS} ${PVS_TSS} )
-QT4_CREATE_TRANSLATION( PVSGUI_QMS ${PVSGUI_SRCS} ${PVSGUI_UI_HDRS} ${PVSGUI_TSS} )
+#QT4_CREATE_TRANSLATION( PVSMGR_QMS ${PVSMGR_SRCS} ${PVSMGR_UI_HDRS} ${PVSMGR_TSS} )
+#QT4_CREATE_TRANSLATION( PVS_QMS ${PVS_SRCS} ${PVS_TSS} )
+#QT4_CREATE_TRANSLATION( PVSGUI_QMS ${PVSGUI_SRCS} ${PVSGUI_UI_HDRS} ${PVSGUI_TSS} )
################################################################################
# Build
@@ -283,7 +291,7 @@ ADD_EXECUTABLE( pvsmgrtouch
)
ENDIF(UNIX)
-ADD_EXECUTABLE( pvs
+ADD_EXECUTABLE( pvs
${PVS_SRCS}
${PVS_MOC_SRCS}
${PVS_RC_SRCS}