[vidalia-svn] r3827: Don't try to add the Marble directories to the include path (vidalia/trunk/src/vidalia)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2009-06-09 02:14:49 -0400 (Tue, 09 Jun 2009)
New Revision: 3827

Modified:
   vidalia/trunk/src/vidalia/CMakeLists.txt
Log:

Don't try to add the Marble directories to the include path on Windows and
OS X when we aren't building with Marble support.


Modified: vidalia/trunk/src/vidalia/CMakeLists.txt
===================================================================
--- vidalia/trunk/src/vidalia/CMakeLists.txt	2009-06-09 02:36:55 UTC (rev 3826)
+++ vidalia/trunk/src/vidalia/CMakeLists.txt	2009-06-09 06:14:49 UTC (rev 3827)
@@ -23,22 +23,24 @@
   ${CMAKE_CURRENT_SOURCE_DIR}/tray
   ${MARBLE_INCLUDE_DIR}
 )
-if (APPLE OR WIN32)
-##
-## XXX: The Marble build system on OS X currently doesn't actually install the
-## required include files to /usr/local/include or similar. Instead, we have
-## to pluck them directly from the source tree. Ick.
-##
-  include_directories(
-    ${MARBLE_INCLUDE_DIR}/AbstractLayer
-    ${MARBLE_INCLUDE_DIR}/geodata
-    ${MARBLE_INCLUDE_DIR}/geodata/data
-    ${MARBLE_INCLUDE_DIR}/geodata/handlers
-    ${MARBLE_INCLUDE_DIR}/geodata/parser
-    ${MARBLE_INCLUDE_DIR}/geodata/scene
-    ${MARBLE_INCLUDE_DIR}/Projections
-  )
-endif(APPLE OR WIN32)
+if (USE_MARBLE)
+  if (APPLE OR WIN32)
+  ##
+  ## XXX: The Marble build system on OS X currently doesn't actually install the
+  ## required include files to /usr/local/include or similar. Instead, we have
+  ## to pluck them directly from the source tree. Ick.
+  ##
+    include_directories(
+      ${MARBLE_INCLUDE_DIR}/AbstractLayer
+      ${MARBLE_INCLUDE_DIR}/geodata
+      ${MARBLE_INCLUDE_DIR}/geodata/data
+      ${MARBLE_INCLUDE_DIR}/geodata/handlers
+      ${MARBLE_INCLUDE_DIR}/geodata/parser
+      ${MARBLE_INCLUDE_DIR}/geodata/scene
+      ${MARBLE_INCLUDE_DIR}/Projections
+    )
+  endif(APPLE OR WIN32)
+endif(USE_MARBLE)
 
 configure_file(
   ${CMAKE_CURRENT_SOURCE_DIR}/res/vidalia_win.rc.in