From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Mon, 4 Jul 2011 21:47:45 +0000 (+0200)
Subject: Fixed cmake buildsystem - option command only supports boolean values
X-Git-Tag: dbus-1.5.6~68
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4ee7b07b208f64f3b76f253c449e86e86849fca8;p=platform%2Fupstream%2Fdbus.git

Fixed cmake buildsystem - option command only supports boolean values
---

diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index ede0d3b..b68a397 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -287,7 +287,7 @@ STRING(TOUPPER ${CMAKE_SYSTEM_NAME} sysname)
 if("${sysname}" MATCHES ".*SOLARIS.*")
     option (HAVE_CONSOLE_OWNER_FILE "enable console owner file (solaris only)" ON)
     if(HAVE_CONSOLE_OWNER_FILE)
-        option (DBUS_CONSOLE_OWNER_FILE "Directory to check for console ownerhip" "/dev/console")
+        set (DBUS_CONSOLE_OWNER_FILE "/dev/console" CACHE STRING "Directory to check for console ownerhip")
     endif(HAVE_CONSOLE_OWNER_FILE)
 endif("${sysname}" MATCHES ".*SOLARIS.*")
 
@@ -347,8 +347,8 @@ if(CMAKE_COMPILER_IS_GNUCC AND NOT DBUS_ENABLE_ANSI)
     endif(UNAME_EXECUTABLE)
 endif(CMAKE_COMPILER_IS_GNUCC AND NOT DBUS_ENABLE_ANSI)
 
-option (DBUS_HAVE_ATOMIC_INT    "Some atomic integer implementation present" ${atomic_int})
-option (DBUS_USE_ATOMIC_INT_486 "Use atomic integer implementation for 486" ${atomic_int_486})
+set (DBUS_HAVE_ATOMIC_INT ${atomic_int} CACHE STRING "Some atomic integer implementation present")
+set (DBUS_USE_ATOMIC_INT_486 ${atomic_int_486} CACHE STRING "Use atomic integer implementation for 486")
 
 if(X11_FOUND)
   option (DBUS_BUILD_X11 "Build with X11 autolaunch support " ON)