From 2f3581bd4a235a2d99d216ccd78b27fa94155940 Mon Sep 17 00:00:00 2001 From: Christian Heinrich Date: Mon, 1 Jun 2015 14:06:40 +0200 Subject: [PATCH 1/1] [Cmake] Fixed wrong set() syntax in cmake files - Files CTestConfig.cmake and Options.cmake were affected - The variable BUILDNAME is declared to be INTERNAL; this means that it should not be displayed in any GUI. However, as the "keyword" (note the quotation marks here) TYPE was given (this does not exist!), it was still displayed; however, the "docstring" property was missing, so I added it. - Check out the documentation here: http://www.cmake.org/cmake/help/v2.8.7/cmake.html#section_Properties --- buildtools/Cmake/CTestConfig.cmake | 14 +++++++------- buildtools/Cmake/Option.cmake | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/buildtools/Cmake/CTestConfig.cmake b/buildtools/Cmake/CTestConfig.cmake index bb6e9fa94a..7631a2d01c 100644 --- a/buildtools/Cmake/CTestConfig.cmake +++ b/buildtools/Cmake/CTestConfig.cmake @@ -2,30 +2,30 @@ # http://www.cmake.org/Wiki/CMake_Testing_With_CTest#Customizing_CTest if(APPLE) - SET(BUILDNAME "APPLE" CACHE TYPE INTERNAL FORCE) + SET(BUILDNAME "APPLE" CACHE INTERNAL "Buildname" FORCE) else() - SET(BUILDNAME "UNIX" CACHE TYPE INTERNAL FORCE) + SET(BUILDNAME "UNIX" CACHE INTERNAL "Buildname" FORCE) if(WIN32) - SET(BUILDNAME "WINDOWS" CACHE TYPE INTERNAL FORCE) + SET(BUILDNAME "WINDOWS" CACHE INTERNAL "Buildname" FORCE) endif() endif() set(DART_TESTING_TIMEOUT "300") #TIMEOUT FOR EACH TEST if(enable_compile_warnings AND enable_compile_optimizations) - SET(BUILDNAME "FULL_FLAGS" CACHE TYPE INTERNAL FORCE) + SET(BUILDNAME "FULL_FLAGS" CACHE INTERNAL "Buildname" FORCE) endif() if(HAVE_GTNETS) - SET(BUILDNAME "GTNETS" CACHE TYPE INTERNAL FORCE) + SET(BUILDNAME "GTNETS" CACHE INTERNAL "Buildname" FORCE) endif() if(HAVE_MC) - SET(BUILDNAME "MODEL-CHECKING" CACHE TYPE INTERNAL FORCE) + SET(BUILDNAME "MODEL-CHECKING" CACHE INTERNAL "Buildname" FORCE) endif() if(enable_memcheck) - SET(BUILDNAME "MEMCHECK" CACHE TYPE INTERNAL FORCE) + SET(BUILDNAME "MEMCHECK" CACHE INTERNAL "Buildname" FORCE) endif() set(osname ${CMAKE_SYSTEM_NAME}) diff --git a/buildtools/Cmake/Option.cmake b/buildtools/Cmake/Option.cmake index 27463ba975..c0c499aea4 100644 --- a/buildtools/Cmake/Option.cmake +++ b/buildtools/Cmake/Option.cmake @@ -11,7 +11,7 @@ else() set(CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "Path where to install project") endif() -set(pipol_user ${pipol_user} CACHE TYPE INTERNAL FORCE) +set(pipol_user ${pipol_user} CACHE INTERNAL "pipol_user" FORCE) mark_as_advanced(pipol_user) option(release "Whether Release Mode is activated (disable tests on experimental parts)" on) -- 2.20.1