[Tux4kids-commits] r1101 - in tux4kids-admin/trunk: plugins/dummy src

[Michał Świtakowski]

Author: swistakers-guest
Date: 2009-06-27 22:23:09 +0000 (Sat, 27 Jun 2009)
New Revision: 1101

Modified:
   tux4kids-admin/trunk/plugins/dummy/CMakeLists.txt
   tux4kids-admin/trunk/src/CMakeLists.txt
Log:
out-of-source build of tux4kids-admin works

Modified: tux4kids-admin/trunk/plugins/dummy/CMakeLists.txt
===================================================================
--- tux4kids-admin/trunk/plugins/dummy/CMakeLists.txt	2009-06-27 20:17:52 UTC (rev 1100)
+++ tux4kids-admin/trunk/plugins/dummy/CMakeLists.txt	2009-06-27 22:23:09 UTC (rev 1101)
@@ -1,7 +1,7 @@
 PROJECT(dummy_plugin)
 cmake_minimum_required(VERSION 2.6)
 
-SET( CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../ )
+SET( CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/../ )
 
 # enable warnings
 ADD_DEFINITIONS( -Wall )
@@ -15,7 +15,7 @@
 
 FIND_PACKAGE( Qt4 REQUIRED )
 INCLUDE( ${QT_USE_FILE} )
-INCLUDE_DIRECTORIES( ../ )
+INCLUDE_DIRECTORIES( ../ ${CMAKE_CURRENT_BINARY_DIR} )
 
 QT4_WRAP_CPP( DUMMY_PLUGIN_MOC_SOURCES ${DUMMY_PLUGIN_MOC_HEADERS} )
 

Modified: tux4kids-admin/trunk/src/CMakeLists.txt
===================================================================
--- tux4kids-admin/trunk/src/CMakeLists.txt	2009-06-27 20:17:52 UTC (rev 1100)
+++ tux4kids-admin/trunk/src/CMakeLists.txt	2009-06-27 22:23:09 UTC (rev 1101)
@@ -1,7 +1,7 @@
 PROJECT(tux4kids-admin)
 cmake_minimum_required(VERSION 2.6)
 
-SET ( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../ )
+SET ( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/../ )
 
 SET(TUX4KIDS-ADMIN_SOURCES 
 	main.cpp
@@ -19,7 +19,7 @@
 
 FIND_PACKAGE( Qt4 REQUIRED )
 INCLUDE( ${QT_USE_FILE} )
-INCLUDE_DIRECTORIES( ../plugins/ )
+INCLUDE_DIRECTORIES( ../plugins/ ${CMAKE_CURRENT_BINARY_DIR} )
 
 QT4_WRAP_UI( TUX4KIDS-ADMIN_UI_HEADERS ${TUX4KIDS-ADMIN_UIS} )
 QT4_WRAP_CPP( TUX4KIDS-ADMIN_MOC_SOURCES ${TUX4KIDS-ADMIN_MOC_HEADERS} )
@@ -27,3 +27,4 @@
 ADD_EXECUTABLE( tux4kids-admin ${TUX4KIDS-ADMIN_SOURCES} ${TUX4KIDS-ADMIN_MOC_SOURCES} ${TUX4KIDS-ADMIN_UI_HEADERS} )
 TARGET_LINK_LIBRARIES( tux4kids-admin ${QT_LIBRARIES} )
 
+