[test-suite] r263484 - cmake: Mark the release/debug/... flags as non-advanced, fix typo in Release.cmake

Matthias Braun via llvm-commits llvm-commits at lists.llvm.org
Mon Mar 14 13:24:46 PDT 2016


Author: matze
Date: Mon Mar 14 15:24:45 2016
New Revision: 263484

URL: http://llvm.org/viewvc/llvm-project?rev=263484&view=rev
Log:
cmake: Mark the release/debug/... flags as non-advanced, fix typo in Release.cmake

Modified:
    test-suite/trunk/CMakeLists.txt
    test-suite/trunk/cmake/caches/Release.cmake

Modified: test-suite/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/CMakeLists.txt?rev=263484&r1=263483&r2=263484&view=diff
==============================================================================
--- test-suite/trunk/CMakeLists.txt (original)
+++ test-suite/trunk/CMakeLists.txt Mon Mar 14 15:24:45 2016
@@ -9,10 +9,16 @@ if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_C
   set(CMAKE_BUILD_TYPE "Release")
 endif()
 # Selecting installation directories or build types is untypical.
-mark_as_advanced(CMAKE_INSTALL_PREFIX CMAKE_BUILD_TYPE)
+mark_as_advanced(CMAKE_INSTALL_PREFIX)
 # On the other hand we often want to switch compiler or cflags
 mark_as_advanced(CLEAR CMAKE_C_COMPILER CMAKE_CXX_COMPILER CMAKE_LINKER
-                 CMAKE_C_FLAGS CMAKE_CXX_FLAGS CMAKE_EXE_LINKER_FLAGS)
+  CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_MINSIZEREL
+  CMAKE_C_FLAGS_RELEASE CMAKE_C_FLAGS_RELWITHDEBINFO
+  CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_MINSIZEREL
+  CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_RELWITHDEBINFO
+  CMAKE_EXE_LINKER_FLAGS CMAKE_EXE_LINKER_FLAGS_DEBUG
+  CMAKE_EXE_LINKER_FLAGS_MINSIZEREL CMAKE_EXE_LINKER_FLAGS_RELEASE
+  CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO)
 
 project(test-suite C CXX)
 

Modified: test-suite/trunk/cmake/caches/Release.cmake
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/cmake/caches/Release.cmake?rev=263484&r1=263483&r2=263484&view=diff
==============================================================================
--- test-suite/trunk/cmake/caches/Release.cmake (original)
+++ test-suite/trunk/cmake/caches/Release.cmake Mon Mar 14 15:24:45 2016
@@ -6,4 +6,4 @@ endif()
 
 set(CMAKE_C_FLAGS_RELEASE "${OPTFLAGS}" CACHE STRING "")
 set(CMAKE_CXX_FLAGS_RELEASE "${OPTFLAGS}" CACHE STRING "")
-set(CMAKE_BUILD_TYPE "Release")
+set(CMAKE_BUILD_TYPE "Release" CACHE STRING "")




More information about the llvm-commits mailing list