From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Mon, 20 Jun 2011 07:29:12 +0000 (+0200)
Subject: CMake fix: Do not use FORCE in variables which should be changeable by the user.
X-Git-Tag: dbus-1.5.6~90
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=736445ee44086e69aba195db8e3834dc0c67fd8e;p=thirdparty%2Fdbus.git

CMake fix: Do not use FORCE in variables which should be changeable by the user.
---

diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 789e947e0..cbe77c2ea 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -439,8 +439,8 @@ set (DBUS_USER )
 
 
 if (WIN32)
-  set (DBUS_SYSTEM_BUS_DEFAULT_ADDRESS "nonce-tcp:" CACHE STRING "system bus default address"  FORCE)
-  set (DBUS_SESSION_BUS_DEFAULT_ADDRESS "nonce-tcp:" CACHE STRING "session bus default address" FORCE)
+  set (DBUS_SYSTEM_BUS_DEFAULT_ADDRESS "nonce-tcp:" CACHE STRING "system bus default address")
+  set (DBUS_SESSION_BUS_DEFAULT_ADDRESS "nonce-tcp:" CACHE STRING "session bus default address")
 
   set (DBUS_SYSTEM_CONFIG_FILE "etc/dbus-1/system.conf")
   set (DBUS_SESSION_CONFIG_FILE "etc/dbus-1/session.conf")
@@ -456,7 +456,7 @@ else (WIN32)
   set (DBUS_USER "root")
 endif (WIN32)
 
-set (DBUS_DAEMON_NAME "dbus-daemon" CACHE STRING "The name of the dbus daemon executable" FORCE)
+set (DBUS_DAEMON_NAME "dbus-daemon" CACHE STRING "The name of the dbus daemon executable")
 
 ########### create config.h ###############