[Tux4kids-commits] r1171 - in tux4kids-admin/trunk: libtux4kidsadmin libtux4kidsadmin_tuxmath tux4kids-admin tux4kids-admin/plugins/tuxmathPlugin tux4kids-admin/src
Michał Świtakowski
swistakers-guest at alioth.debian.org
Thu Jul 9 22:57:41 UTC 2009
Author: swistakers-guest
Date: 2009-07-09 22:57:41 +0000 (Thu, 09 Jul 2009)
New Revision: 1171
Added:
tux4kids-admin/trunk/libtux4kidsadmin/CMakeLists.txt
tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/CMakeLists.txt
Modified:
tux4kids-admin/trunk/libtux4kidsadmin/applicationDir.h
tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/applicationDirTuxmath.h
tux4kids-admin/trunk/tux4kids-admin/CMakeLists.txt
tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/CMakeLists.txt
tux4kids-admin/trunk/tux4kids-admin/src/CMakeLists.txt
tux4kids-admin/trunk/tux4kids-admin/src/src.pro
Log:
cmake for libs
Added: tux4kids-admin/trunk/libtux4kidsadmin/CMakeLists.txt
===================================================================
--- tux4kids-admin/trunk/libtux4kidsadmin/CMakeLists.txt (rev 0)
+++ tux4kids-admin/trunk/libtux4kidsadmin/CMakeLists.txt 2009-07-09 22:57:41 UTC (rev 1171)
@@ -0,0 +1,21 @@
+project(libtux4kidsadmin)
+cmake_minimum_required(VERSION 2.6)
+
+#SET ( CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR} )
+
+SET(LIBTUX4KIDSADMIN_SOURCES
+ libtux4kidsadmin.cpp
+ applicationDir.cpp )
+
+SET(LIBTUX4KIDSADMIN_MOC_HEADERS
+ applicationDir.h )
+
+# enable warnings
+ADD_DEFINITIONS( -Wall )
+
+FIND_PACKAGE( Qt4 REQUIRED )
+INCLUDE( ${QT_USE_FILE} )
+
+QT4_WRAP_CPP( LIBTUX4KIDSADMIN_MOC_SOURCES ${LIBTUX4KIDSADMIN_MOC_HEADERS} )
+
+ADD_LIBRARY(tux4kidsadmin SHARED ${LIBTUX4KIDSADMIN_SOURCES} ${LIBTUX4KIDSADMIN_MOC_SOURCES} )
Modified: tux4kids-admin/trunk/libtux4kidsadmin/applicationDir.h
===================================================================
--- tux4kids-admin/trunk/libtux4kidsadmin/applicationDir.h 2009-07-09 21:28:11 UTC (rev 1170)
+++ tux4kids-admin/trunk/libtux4kidsadmin/applicationDir.h 2009-07-09 22:57:41 UTC (rev 1171)
@@ -8,6 +8,7 @@
class LIBTUX4KIDSADMINSHARED_EXPORT ApplicationDir : public QObject
{
+ Q_OBJECT
public:
ApplicationDir(QObject *parent = 0);
virtual QString foo();
Added: tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/CMakeLists.txt
===================================================================
--- tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/CMakeLists.txt (rev 0)
+++ tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/CMakeLists.txt 2009-07-09 22:57:41 UTC (rev 1171)
@@ -0,0 +1,21 @@
+project(libtux4kidsadmin_tuxmath)
+cmake_minimum_required(VERSION 2.6)
+
+#SET ( CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR} )
+
+SET(LIBTUX4KIDSADMIN_TUXMATH_SOURCES
+ libtux4kidsadmin_tuxmath.cpp
+ applicationDirTuxmath.cpp )
+
+SET(LIBTUX4KIDSADMIN_TUXMATH_MOC_HEADERS
+ applicationDirTuxmath.h )
+
+# enable warnings
+ADD_DEFINITIONS( -Wall )
+
+FIND_PACKAGE( Qt4 REQUIRED )
+INCLUDE( ${QT_USE_FILE} )
+INCLUDE_DIRECTORIES( ../libtux4kidsadmin )
+QT4_WRAP_CPP( LIBTUX4KIDSADMIN_TUXMATH_MOC_SOURCES ${LIBTUX4KIDSADMIN_TUXMATH_MOC_HEADERS} )
+
+ADD_LIBRARY(tux4kidsadmin_tuxmath SHARED ${LIBTUX4KIDSADMIN__TUXMATHSOURCES} ${LIBTUX4KIDSADMIN_TUXMATH_MOC_SOURCES} )
Modified: tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/applicationDirTuxmath.h
===================================================================
--- tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/applicationDirTuxmath.h 2009-07-09 21:28:11 UTC (rev 1170)
+++ tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/applicationDirTuxmath.h 2009-07-09 22:57:41 UTC (rev 1171)
@@ -8,6 +8,7 @@
class LIBTUX4KIDSADMIN_TUXMATHSHARED_EXPORT ApplicationDirTuxmath : public ApplicationDir
{
+ Q_OBJECT
public:
ApplicationDirTuxmath();
QString foo();
Modified: tux4kids-admin/trunk/tux4kids-admin/CMakeLists.txt
===================================================================
--- tux4kids-admin/trunk/tux4kids-admin/CMakeLists.txt 2009-07-09 21:28:11 UTC (rev 1170)
+++ tux4kids-admin/trunk/tux4kids-admin/CMakeLists.txt 2009-07-09 22:57:41 UTC (rev 1171)
@@ -5,6 +5,7 @@
add_subdirectory( plugins/tuxmathPlugin )
find_package( Qt4 REQUIRED )
+#INCLUDE_DIRECTORIES( tux4kids-admin/plugins ../libtux4kidsadmin_tuxmath ../libtux4kidsadmin )
SET(TS_FILES translations/tux4kids-admin_pl.ts )
Modified: tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/CMakeLists.txt
===================================================================
--- tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/CMakeLists.txt 2009-07-09 21:28:11 UTC (rev 1170)
+++ tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/CMakeLists.txt 2009-07-09 22:57:41 UTC (rev 1171)
@@ -10,15 +10,24 @@
#ADD_DEFINITIONS(-DQT_NO_DEBUG)
ADD_DEFINITIONS(-DQT_SHARED)
-SET(TUXMATH_PLUGIN_MOC_HEADERS tuxmathPlugin.h)
-SET(TUXMATH_PLUGIN_SOURCES tuxmathPlugin.cpp)
+SET(TUXMATH_PLUGIN_MOC_HEADERS
+ tuxmathPlugin.h
+ tuxmathMainWidget.h )
+SET(TUXMATH_PLUGIN_SOURCES
+ tuxmathPlugin.cpp
+ tuxmathMainWidget.h )
+
+SET(TUXMATH_PLUGIN_UIS
+ tuxmathMainWidget.ui )
+
FIND_PACKAGE( Qt4 REQUIRED )
INCLUDE( ${QT_USE_FILE} )
-INCLUDE_DIRECTORIES( ../ ${CMAKE_CURRENT_BINARY_DIR} )
+INCLUDE_DIRECTORIES( ../ ../../../libtux4kidsadmin_tuxmath ../../../libtux4kidsadmin )
+QT4_WRAP_UI( TUXMATH_PLUGIN_UI_HEADERS ${TUXMATH_PLUGIN_UIS} )
QT4_WRAP_CPP( TUXMATH_PLUGIN_MOC_SOURCES ${TUXMATH_PLUGIN_MOC_HEADERS} )
-ADD_LIBRARY(TuxmathPlugin SHARED ${TUXMATH_PLUGIN_MOC_SOURCES} ${TUXMATH_PLUGIN_SOURCES} )
-TARGET_LINK_LIBRARIES( TuxmathPlugin ${QT_LIBRARIES} )
+ADD_LIBRARY(TuxmathPlugin SHARED ${TUXMATH_PLUGIN_MOC_SOURCES} ${TUXMATH_PLUGIN_SOURCES} ${TUXMATH_PLUGIN_UI_HEADERS} )
+TARGET_LINK_LIBRARIES( TuxmathPlugin ${QT_LIBRARIES} tux4kidsadmin_tuxmath tux4kidsadmin )
Modified: tux4kids-admin/trunk/tux4kids-admin/src/CMakeLists.txt
===================================================================
--- tux4kids-admin/trunk/tux4kids-admin/src/CMakeLists.txt 2009-07-09 21:28:11 UTC (rev 1170)
+++ tux4kids-admin/trunk/tux4kids-admin/src/CMakeLists.txt 2009-07-09 22:57:41 UTC (rev 1171)
@@ -1,25 +1,31 @@
PROJECT(tux4kids-admin)
cmake_minimum_required(VERSION 2.6)
-SET ( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/../ )
+SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/../ )
SET(TUX4KIDS-ADMIN_SOURCES
main.cpp
mainWindow.cpp
- mainController.cpp )
+ mainController.cpp
+ pluginManager.cpp
+ pluginManagerDialog.cpp )
SET(TUX4KIDS-ADMIN_MOC_HEADERS
mainWindow.h
- mainController.h )
+ mainController.h
+ pluginManager.h
+ pluginManagerDialog.h )
-SET(TUX4KIDS-ADMIN_UIS mainWindow.ui)
+SET(TUX4KIDS-ADMIN_UIS
+ mainWindow.ui
+ pluginManagerDialog.ui )
# enable warnings
ADD_DEFINITIONS( -Wall )
FIND_PACKAGE( Qt4 REQUIRED )
INCLUDE( ${QT_USE_FILE} )
-INCLUDE_DIRECTORIES( ../plugins/ ${CMAKE_CURRENT_BINARY_DIR} )
+INCLUDE_DIRECTORIES( ../plugins/ )
QT4_WRAP_UI( TUX4KIDS-ADMIN_UI_HEADERS ${TUX4KIDS-ADMIN_UIS} )
QT4_WRAP_CPP( TUX4KIDS-ADMIN_MOC_SOURCES ${TUX4KIDS-ADMIN_MOC_HEADERS} )
Modified: tux4kids-admin/trunk/tux4kids-admin/src/src.pro
===================================================================
--- tux4kids-admin/trunk/tux4kids-admin/src/src.pro 2009-07-09 21:28:11 UTC (rev 1170)
+++ tux4kids-admin/trunk/tux4kids-admin/src/src.pro 2009-07-09 22:57:41 UTC (rev 1171)
@@ -19,3 +19,5 @@
pluginManagerDialog.ui
+
+
More information about the Tux4kids-commits
mailing list