# HG changeset patch
# User koda
# Date 1296685274 -3600
# Node ID 9dcb2e83b24f9b9582c220d2cd2ccf8b9a7d1c49
# Parent  dc6482438674b79b4f215e272338217ae8eb6560# Parent  663aa9552bfc58b75e9f3f3fe5016989a85eecfa
guess what? merge 0.9.15 again...

diff -r dc6482438674 -r 9dcb2e83b24f QTfrontend/CMakeLists.txt
--- a/QTfrontend/CMakeLists.txt	Wed Feb 02 22:19:10 2011 +0300
+++ b/QTfrontend/CMakeLists.txt	Wed Feb 02 23:21:14 2011 +0100
@@ -171,11 +171,13 @@
     set(hwfr_src ${hwfr_src} InstallController.cpp CocoaInitializer.mm M3Panel.mm M3InstallController.m NSWorkspace_RBAdditions.m)
     set(HW_LINK_LIBS IOKit)
 
-    find_package(Sparkle)
-    if(SPARKLE_FOUND)
-                add_definitions(-DSPARKLE_ENABLED)
-        set(hwfr_src ${hwfr_src} AutoUpdater.cpp SparkleAutoUpdater.mm)
-                set(HW_LINK_LIBS ${SPARKLE_LIBRARY} ${HW_LINK_LIBS})
+    if(NOT NOAUTOUPDATE)
+        find_package(Sparkle)
+        if(SPARKLE_FOUND)
+            add_definitions(-DSPARKLE_ENABLED)
+            set(hwfr_src ${hwfr_src} AutoUpdater.cpp SparkleAutoUpdater.mm)
+            set(HW_LINK_LIBS ${SPARKLE_LIBRARY} ${HW_LINK_LIBS})
+        endif()
     endif()
 endif()
 
diff -r dc6482438674 -r 9dcb2e83b24f tools/CMakeLists.txt
--- a/tools/CMakeLists.txt	Wed Feb 02 22:19:10 2011 +0300
+++ b/tools/CMakeLists.txt	Wed Feb 02 23:21:14 2011 +0100
@@ -16,7 +16,14 @@
 	find_package(SDL_ttf REQUIRED)
 	find_package(SDL_mixer REQUIRED)
 	find_package(OGGVORBIS REQUIRED)
-	find_package(SPARKLE)
+        if(NOT NOAUTOUPDATE)
+		find_package(SPARKLE)
+		if(SPARKLE_FOUND)
+			set(SPARKLE_FOUND 1)
+		else()
+			set(SPARKLE_FOUND 0)
+		endif()
+	endif()
 
 	#use the associated tool from the libraries we've selected
 	string(REGEX REPLACE "(.*)/include.*" "\\1" qt_base_dir "${QT_INCLUDE_DIR}")
@@ -35,12 +42,6 @@
 
 	string(REGEX REPLACE "(.*);-.*" "\\1" sdl_dir "${SDL_LIBRARY}")
 
-	if(SPARKLE_FOUND)
-		set(SPARKLE_FOUND 1)
-	else()
-		set(SPARKLE_FOUND 0)
-	endif()
-
 	CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/CreateMacBundle.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/CreateMacBundle.cmake)
 
 endif(APPLE AND BUNDLE)