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

[Michał Świtakowski]

Author: swistakers-guest
Date: 2009-07-10 10:18:12 +0000 (Fri, 10 Jul 2009)
New Revision: 1175

Modified:
   tux4kids-admin/trunk/libtux4kidsadmin/CMakeLists.txt
   tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/CMakeLists.txt
   tux4kids-admin/trunk/tux4kids-admin/plugins/dummy/CMakeLists.txt
   tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/CMakeLists.txt
Log:
fixed various issues with cmake

Modified: tux4kids-admin/trunk/libtux4kidsadmin/CMakeLists.txt
===================================================================
--- tux4kids-admin/trunk/libtux4kidsadmin/CMakeLists.txt	2009-07-10 00:13:07 UTC (rev 1174)
+++ tux4kids-admin/trunk/libtux4kidsadmin/CMakeLists.txt	2009-07-10 10:18:12 UTC (rev 1175)
@@ -1,8 +1,6 @@
 project(libtux4kidsadmin)
 cmake_minimum_required(VERSION 2.6)
 
-#SET ( CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR} )
-
 SET(LIBTUX4KIDSADMIN_SOURCES 
 	libtux4kidsadmin.cpp
 	applicationDir.cpp )
@@ -12,8 +10,10 @@
 
 # enable warnings
 ADD_DEFINITIONS( -Wall -DLIBTUX4KIDSADMIN_LIBRARY )
+#ADD_DEFINITIONS(-DQT_NO_DEBUG)
 
 FIND_PACKAGE( Qt4 REQUIRED )
+SET(QT_DONT_USE_QTGUI 1)
 INCLUDE( ${QT_USE_FILE} )
 
 QT4_WRAP_CPP( LIBTUX4KIDSADMIN_MOC_SOURCES ${LIBTUX4KIDSADMIN_MOC_HEADERS} )

Modified: tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/CMakeLists.txt
===================================================================
--- tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/CMakeLists.txt	2009-07-10 00:13:07 UTC (rev 1174)
+++ tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/CMakeLists.txt	2009-07-10 10:18:12 UTC (rev 1175)
@@ -1,8 +1,6 @@
 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 )
@@ -12,8 +10,10 @@
 
 # enable warnings
 ADD_DEFINITIONS( -Wall -DLIBTUX4KIDSADMIN_TUXMATH_LIBRARY )
+#ADD_DEFINITIONS(-DQT_NO_DEBUG)
 
 FIND_PACKAGE( Qt4 REQUIRED )
+SET(QT_DONT_USE_QTGUI 1)
 INCLUDE( ${QT_USE_FILE} )
 INCLUDE_DIRECTORIES( ../libtux4kidsadmin )
 QT4_WRAP_CPP( LIBTUX4KIDSADMIN_TUXMATH_MOC_SOURCES ${LIBTUX4KIDSADMIN_TUXMATH_MOC_HEADERS} )

Modified: tux4kids-admin/trunk/tux4kids-admin/plugins/dummy/CMakeLists.txt
===================================================================
--- tux4kids-admin/trunk/tux4kids-admin/plugins/dummy/CMakeLists.txt	2009-07-10 00:13:07 UTC (rev 1174)
+++ tux4kids-admin/trunk/tux4kids-admin/plugins/dummy/CMakeLists.txt	2009-07-10 10:18:12 UTC (rev 1175)
@@ -1,14 +1,11 @@
 PROJECT(dummy_plugin)
 cmake_minimum_required(VERSION 2.6)
 
-SET( CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/../ )
+SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/../ )
 
 # enable warnings
-ADD_DEFINITIONS( -Wall )
-ADD_DEFINITIONS(${QT_DEFINITIONS})
-ADD_DEFINITIONS(-DQT_PLUGIN)
+ADD_DEFINITIONS(-Wall -DQT_PLUGIN -DQT_SHARED)
 #ADD_DEFINITIONS(-DQT_NO_DEBUG)
-ADD_DEFINITIONS(-DQT_SHARED)
 
 SET(DUMMY_PLUGIN_MOC_HEADERS dummy.h)
 SET(DUMMY_PLUGIN_SOURCES dummy.cpp)

Modified: tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/CMakeLists.txt
===================================================================
--- tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/CMakeLists.txt	2009-07-10 00:13:07 UTC (rev 1174)
+++ tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/CMakeLists.txt	2009-07-10 10:18:12 UTC (rev 1175)
@@ -1,22 +1,19 @@
 PROJECT(tuxmathPlugin)
 cmake_minimum_required(VERSION 2.6)
 
-SET( CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/../ )
+SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/../ )
 
 # enable warnings
-ADD_DEFINITIONS( -Wall )
-ADD_DEFINITIONS(${QT_DEFINITIONS})
-ADD_DEFINITIONS(-DQT_PLUGIN)
+ADD_DEFINITIONS(-Wall -DQT_PLUGIN -DQT_SHARED)
 #ADD_DEFINITIONS(-DQT_NO_DEBUG)
-ADD_DEFINITIONS(-DQT_SHARED)
 
 SET(TUXMATH_PLUGIN_MOC_HEADERS 
 	tuxmathPlugin.h
-	tuxmathMainWidget.cpp )
+	tuxmathMainWidget.h )
 
 SET(TUXMATH_PLUGIN_SOURCES 
 	tuxmathPlugin.cpp 
-	tuxmathMainWidget.h )
+	tuxmathMainWidget.cpp )
 
 SET(TUXMATH_PLUGIN_UIS 
 	tuxmathMainWidget.ui )