[vidalia-svn] r2225: Write config.h to CMAKE_CURRENT_BINARY_DIR, so different out (trunk)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2007-12-16 20:38:05 -0500 (Sun, 16 Dec 2007)
New Revision: 2225

Modified:
   trunk/
   trunk/CMakeLists.txt
Log:
 r2320@lysithea:  edmanm | 2007-12-16 20:36:54 -0500
 Write config.h to CMAKE_CURRENT_BINARY_DIR, so different out-of-source builds
 can have different configurations.



Property changes on: trunk
___________________________________________________________________
 svk:merge ticket from /local/vidalia/trunk [r2320] on 0108964c-5b0b-4c9e-969f-e2288315d100

Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt	2007-12-17 01:37:57 UTC (rev 2224)
+++ trunk/CMakeLists.txt	2007-12-17 01:38:05 UTC (rev 2225)
@@ -42,7 +42,6 @@
 include(${QT_USE_FILE})
 include(VidaliaMacros.cmake)
 include(CheckIncludeFileCXX)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
 ## Define Vidalia-specific CMake options
 if (APPLE)
@@ -74,8 +73,9 @@
 ## Write out a configuration file
 configure_file(
   ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in
-  ${CMAKE_CURRENT_SOURCE_DIR}/config.h
+  ${CMAKE_CURRENT_BINARY_DIR}/config.h
 )
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 ## Add the actual source directories
 add_subdirectory(src)