Commit 37a81fc9 authored by Ralf Habacker's avatar Ralf Habacker

fixed cmake error: doc says CACHE needs type *and* doc string

cherry-picked aba867f2
parent 2f3403c3
......@@ -36,7 +36,7 @@ if ($ENV{DBUSDIR})
endif ($ENV{DBUSDIR})
if (DBUS_INSTALL_DIR)
set(CMAKE_INSTALL_PREFIX "${DBUS_INSTALL_DIR}" CACHE TYPE PATH FORCE)
set(CMAKE_INSTALL_PREFIX "${DBUS_INSTALL_DIR}" CACHE PATH "install prefix" FORCE)
else (DBUS_INSTALL_DIR)
set(DBUS_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}")
endif (DBUS_INSTALL_DIR)
......@@ -117,8 +117,7 @@ SET(DBUS_SOURCE_DIR ${CMAKE_SOURCE_DIR}/..)
include (MacroLibrary)
if(VCS)
set(DBUS_VERBOSE_C_S 1 CACHE TYPE STRING FORCE)
set(DBUS_VERBOSE_C_S 1)
set(DBUS_VERBOSE_C_S 1 CACHE STRING "verbose mode" FORCE)
endif(VCS)
if(WIN32)
......@@ -135,8 +134,8 @@ if(WIN32)
# Use the highest warning level
if (WALL)
set(WALL 1 CACHE TYPE STRING FORCE)
set(CMAKE_CXX_WARNING_LEVEL 4 CACHE TYPE STRING FORCE)
set(WALL 1 CACHE STRING "all warnings" FORCE)
set(CMAKE_CXX_WARNING_LEVEL 4 CACHE STRING "warning level" FORCE)
if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
STRING(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
......@@ -150,7 +149,7 @@ if(WIN32)
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W4")
endif(CMAKE_C_FLAGS MATCHES "/W[0-4]")
else (WALL)
set(CMAKE_CXX_WARNING_LEVEL 3 CACHE TYPE STRING FORCE)
set(CMAKE_CXX_WARNING_LEVEL 3 CACHE STRING "warning level" FORCE)
endif (WALL)
SET(MSVC_W_ERROR " /we4028 /we4013 /we4133 /we4047 /we4031 /we4002 /we4003 /we4114")
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment