[Tux4kids-commits] r1176 - in tux4kids-admin/trunk/tux4kids-admin/plugins: dummy tuxmathPlugin

[Michał Świtakowski]

Author: swistakers-guest
Date: 2009-07-10 10:34:38 +0000 (Fri, 10 Jul 2009)
New Revision: 1176

Modified:
   tux4kids-admin/trunk/tux4kids-admin/plugins/dummy/CMakeLists.txt
   tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/CMakeLists.txt
Log:
further cmake fixes

Modified: tux4kids-admin/trunk/tux4kids-admin/plugins/dummy/CMakeLists.txt
===================================================================
--- tux4kids-admin/trunk/tux4kids-admin/plugins/dummy/CMakeLists.txt	2009-07-10 10:18:12 UTC (rev 1175)
+++ tux4kids-admin/trunk/tux4kids-admin/plugins/dummy/CMakeLists.txt	2009-07-10 10:34:38 UTC (rev 1176)
@@ -2,6 +2,7 @@
 cmake_minimum_required(VERSION 2.6)
 
 SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/../ )
+SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/../ )
 
 # enable warnings
 ADD_DEFINITIONS(-Wall -DQT_PLUGIN -DQT_SHARED)

Modified: tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/CMakeLists.txt
===================================================================
--- tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/CMakeLists.txt	2009-07-10 10:18:12 UTC (rev 1175)
+++ tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/CMakeLists.txt	2009-07-10 10:34:38 UTC (rev 1176)
@@ -2,6 +2,7 @@
 cmake_minimum_required(VERSION 2.6)
 
 SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/../ )
+SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/../ )
 
 # enable warnings
 ADD_DEFINITIONS(-Wall -DQT_PLUGIN -DQT_SHARED)
@@ -20,7 +21,7 @@
 
 FIND_PACKAGE( Qt4 REQUIRED )
 INCLUDE( ${QT_USE_FILE} )
-INCLUDE_DIRECTORIES( ../ ../../../libtux4kidsadmin_tuxmath ../../../libtux4kidsadmin )
+INCLUDE_DIRECTORIES( ../ ../../../libtux4kidsadmin_tuxmath ../../../libtux4kidsadmin ${CMAKE_CURRENT_BINARY_DIR} )
 
 QT4_WRAP_UI( TUXMATH_PLUGIN_UI_HEADERS ${TUXMATH_PLUGIN_UIS} )
 QT4_WRAP_CPP( TUXMATH_PLUGIN_MOC_SOURCES ${TUXMATH_PLUGIN_MOC_HEADERS} )