[Tux4kids-commits] r1174 - in tux4kids-admin/trunk: libtux4kidsadmin libtux4kidsadmin_tuxmath tux4kids-admin/plugins/tuxmathPlugin

Michał Świtakowski swistakers-guest at alioth.debian.org
Fri Jul 10 00:13:07 UTC 2009


Author: swistakers-guest
Date: 2009-07-10 00:13:07 +0000 (Fri, 10 Jul 2009)
New Revision: 1174

Modified:
   tux4kids-admin/trunk/libtux4kidsadmin/CMakeLists.txt
   tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/CMakeLists.txt
   tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/CMakeLists.txt
Log:
libs build on windows

Modified: tux4kids-admin/trunk/libtux4kidsadmin/CMakeLists.txt
===================================================================
--- tux4kids-admin/trunk/libtux4kidsadmin/CMakeLists.txt	2009-07-09 23:13:56 UTC (rev 1173)
+++ tux4kids-admin/trunk/libtux4kidsadmin/CMakeLists.txt	2009-07-10 00:13:07 UTC (rev 1174)
@@ -11,7 +11,7 @@
 	applicationDir.h )
 
 # enable warnings
-ADD_DEFINITIONS( -Wall )
+ADD_DEFINITIONS( -Wall -DLIBTUX4KIDSADMIN_LIBRARY )
 
 FIND_PACKAGE( Qt4 REQUIRED )
 INCLUDE( ${QT_USE_FILE} )
@@ -19,3 +19,4 @@
 QT4_WRAP_CPP( LIBTUX4KIDSADMIN_MOC_SOURCES ${LIBTUX4KIDSADMIN_MOC_HEADERS} )
 
 ADD_LIBRARY(tux4kidsadmin SHARED ${LIBTUX4KIDSADMIN_SOURCES} ${LIBTUX4KIDSADMIN_MOC_SOURCES} )
+TARGET_LINK_LIBRARIES( tux4kidsadmin ${QT_LIBRARIES} )

Modified: tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/CMakeLists.txt
===================================================================
--- tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/CMakeLists.txt	2009-07-09 23:13:56 UTC (rev 1173)
+++ tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/CMakeLists.txt	2009-07-10 00:13:07 UTC (rev 1174)
@@ -11,11 +11,12 @@
 	applicationDirTuxmath.h )
 
 # enable warnings
-ADD_DEFINITIONS( -Wall )
+ADD_DEFINITIONS( -Wall -DLIBTUX4KIDSADMIN_TUXMATH_LIBRARY )
 
 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} )
+ADD_LIBRARY(tux4kidsadmin_tuxmath SHARED ${LIBTUX4KIDSADMIN_TUXMATH_SOURCES} ${LIBTUX4KIDSADMIN_TUXMATH_MOC_SOURCES} )
+TARGET_LINK_LIBRARIES( tux4kidsadmin_tuxmath ${QT_LIBRARIES} tux4kidsadmin )
\ No newline at end of file

Modified: tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/CMakeLists.txt
===================================================================
--- tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/CMakeLists.txt	2009-07-09 23:13:56 UTC (rev 1173)
+++ tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/CMakeLists.txt	2009-07-10 00:13:07 UTC (rev 1174)
@@ -12,7 +12,7 @@
 
 SET(TUXMATH_PLUGIN_MOC_HEADERS 
 	tuxmathPlugin.h
-	tuxmathMainWidget.h )
+	tuxmathMainWidget.cpp )
 
 SET(TUXMATH_PLUGIN_SOURCES 
 	tuxmathPlugin.cpp 




More information about the Tux4kids-commits mailing list