From: Ralf Habacker Date: Thu, 22 Sep 2011 18:03:48 +0000 (+0200) Subject: Fixed cmake buildsystem - option command only supports boolean values X-Git-Tag: dbus-1.4.18~19^2~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b49e27866741238223f0b62d9ed5fe1e68eff336;p=thirdparty%2Fdbus.git Fixed cmake buildsystem - option command only supports boolean values Conflicts: cmake/CMakeLists.txt cherry picked 4ee7b07b208f64f3b76f253c449e86e86849fca8 from master Reviewed-by: Simon McVittie --- diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 905a6b81a..54a10e62d 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -294,7 +294,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) - SET(DBUS_CONSOLE_OWNER_FILE "/dev/console" CACHE STRING "Directory to check for console ownerhip") + set (DBUS_CONSOLE_OWNER_FILE "/dev/console" CACHE STRING "Directory to check for console ownerhip") endif(HAVE_CONSOLE_OWNER_FILE) endif("${sysname}" MATCHES ".*SOLARIS.*") @@ -348,8 +348,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)