[Tux4kids-commits] r1446 - in tux4kids-admin/trunk/tux4kids-admin/plugins: tuxmathPlugin tuxtypePlugin

[Michał Świtakowski]

Author: swistakers-guest
Date: 2009-08-16 18:18:06 +0000 (Sun, 16 Aug 2009)
New Revision: 1446

Modified:
   tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/CMakeLists.txt
   tux4kids-admin/trunk/tux4kids-admin/plugins/tuxtypePlugin/CMakeLists.txt
Log:
fixed build on Windows

Modified: tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/CMakeLists.txt
===================================================================
--- tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/CMakeLists.txt	2009-08-16 18:04:24 UTC (rev 1445)
+++ tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/CMakeLists.txt	2009-08-16 18:18:06 UTC (rev 1446)
@@ -22,13 +22,28 @@
 	tuxmathMainWidget.ui
 	editTuxmathOptions.ui )
 
+SET(TUX4KIDS_ADMIN_SOURCES
+	../../src/studentTableModel.cpp
+	../../src/selectStudentWidget.cpp 
+	../../src/studentTableProxyModel.cpp )
+
+SET(TUX4KIDS_ADMIN_UIS
+	../../src/selectStudentWidget.ui )	
+	
+SET(TUX4KIDS_ADMIN_MOC_HEADERS
+	../../src/selectStudentWidget.h
+	../../src/studentTableModel.h
+	../../src/studentTableProxyModel.h )	
+	
 FIND_PACKAGE( Qt4 REQUIRED )
 INCLUDE( ${QT_USE_FILE} )
 INCLUDE_DIRECTORIES( ../ ../../src ../../../libtux4kidsadmin_tuxmath ../../../libtux4kidsadmin ${CMAKE_CURRENT_BINARY_DIR} )
 
 QT4_WRAP_UI( TUXMATH_PLUGIN_UI_HEADERS ${TUXMATH_PLUGIN_UIS} )
+QT4_WRAP_UI( TUX4KIDS_ADMIN_UI_HEADERS ${TUX4KIDS_ADMIN_UIS} )
 QT4_WRAP_CPP( TUXMATH_PLUGIN_MOC_SOURCES ${TUXMATH_PLUGIN_MOC_HEADERS} )
+QT4_WRAP_CPP( TUX4KIDS_ADMIN_MOC_SOURCES ${TUX4KIDS_ADMIN_MOC_HEADERS} )
 
-ADD_LIBRARY(TuxmathPlugin SHARED ${TUXMATH_PLUGIN_MOC_SOURCES} ${TUXMATH_PLUGIN_SOURCES} ${TUXMATH_PLUGIN_UI_HEADERS} )
+ADD_LIBRARY(TuxmathPlugin SHARED ${TUXMATH_PLUGIN_MOC_SOURCES} ${TUXMATH_PLUGIN_SOURCES} ${TUXMATH_PLUGIN_UI_HEADERS} ${TUX4KIDS_ADMIN_SOURCES} ${TUX4KIDS_ADMIN_MOC_SOURCES} ${TUX4KIDS_ADMIN_UI_HEADERS} )
 TARGET_LINK_LIBRARIES( TuxmathPlugin ${QT_LIBRARIES} tux4kidsadmin_tuxmath tux4kidsadmin )
 

Modified: tux4kids-admin/trunk/tux4kids-admin/plugins/tuxtypePlugin/CMakeLists.txt
===================================================================
--- tux4kids-admin/trunk/tux4kids-admin/plugins/tuxtypePlugin/CMakeLists.txt	2009-08-16 18:04:24 UTC (rev 1445)
+++ tux4kids-admin/trunk/tux4kids-admin/plugins/tuxtypePlugin/CMakeLists.txt	2009-08-16 18:18:06 UTC (rev 1446)
@@ -21,14 +21,29 @@
 SET(TUXTYPE_PLUGIN_UIS 
 	tuxtypeMainWidget.ui
 	editWordListDialog.ui )
+	
+SET(TUX4KIDS_ADMIN_SOURCES
+	../../src/studentTableModel.cpp
+	../../src/selectStudentWidget.cpp 
+	../../src/studentTableProxyModel.cpp )
 
+SET(TUX4KIDS_ADMIN_UIS
+	../../src/selectStudentWidget.ui )	
+	
+SET(TUX4KIDS_ADMIN_MOC_HEADERS
+	../../src/selectStudentWidget.h
+	../../src/studentTableModel.h
+	../../src/studentTableProxyModel.h )
+
 FIND_PACKAGE( Qt4 REQUIRED )
 INCLUDE( ${QT_USE_FILE} )
 INCLUDE_DIRECTORIES( ../ ../../src ../../../libtux4kidsadmin_tuxtype ../../../libtux4kidsadmin ${CMAKE_CURRENT_BINARY_DIR} )
 
 QT4_WRAP_UI( TUXTYPE_PLUGIN_UI_HEADERS ${TUXTYPE_PLUGIN_UIS} )
+QT4_WRAP_UI( TUX4KIDS_ADMIN_UI_HEADERS ${TUX4KIDS_ADMIN_UIS} )
 QT4_WRAP_CPP( TUXTYPE_PLUGIN_MOC_SOURCES ${TUXTYPE_PLUGIN_MOC_HEADERS} )
+QT4_WRAP_CPP( TUX4KIDS_ADMIN_MOC_SOURCES ${TUX4KIDS_ADMIN_MOC_HEADERS} )
 
-ADD_LIBRARY(TuxtypePlugin SHARED ${TUXTYPE_PLUGIN_MOC_SOURCES} ${TUXTYPE_PLUGIN_SOURCES} ${TUXTYPE_PLUGIN_UI_HEADERS} )
+ADD_LIBRARY(TuxtypePlugin SHARED ${TUXTYPE_PLUGIN_MOC_SOURCES} ${TUXTYPE_PLUGIN_SOURCES} ${TUXTYPE_PLUGIN_UI_HEADERS} ${TUX4KIDS_ADMIN_SOURCES} ${TUX4KIDS_ADMIN_MOC_SOURCES} ${TUX4KIDS_ADMIN_UI_HEADERS} )
 TARGET_LINK_LIBRARIES( TuxtypePlugin ${QT_LIBRARIES} tux4kidsadmin_tuxtype tux4kidsadmin )