[test-suite] r344155 - cmake: Add TEST_SUITE_EXTRA_*_FLAGS variable

[Matthias Braun via llvm-commits]

Author: matze
Date: Wed Oct 10 10:00:45 2018
New Revision: 344155

URL: http://llvm.org/viewvc/llvm-project?rev=344155&view=rev
Log:
cmake: Add TEST_SUITE_EXTRA_*_FLAGS variable

Introduce TEST_SUITE_EXTRA_C_FLAGS, TEST_SUITE_EXTRA_CXX_FLAGS
and TEST_SUITE_EXTRA_EXE_LINKER_FLAGS. They simply get appended at the end of
CMAKE_* flags. They are mostly intended for cache files that want
settings to take effect even when the user manually overrides CMAKE_*
flags.

Modified:
    test-suite/trunk/CMakeLists.txt

Modified: test-suite/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/CMakeLists.txt?rev=344155&r1=344154&r2=344155&view=diff
==============================================================================
--- test-suite/trunk/CMakeLists.txt (original)
+++ test-suite/trunk/CMakeLists.txt Wed Oct 10 10:00:45 2018
@@ -131,6 +131,20 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}
 set(CMAKE_EXE_LINKER_FLAGS
     "${CMAKE_EXE_LINKER_FLAGS} ${TEST_SUITE_DIAGNOSE_LINKER_FLAGS}")
 
+# Append extra flags. These extra flags are mainly meant for cache files that
+# want to apply flags that get not override even when the user manually
+# specifies CMAKE_C_FLAGS and similar.
+set(TEST_SUITE_EXTRA_C_FLAGS CACHE STRING "Extra flags for CMAKE_C_FLAGS")
+set(TEST_SUITE_EXTRA_CXX_FLAGS CACHE STRING "Extra flags for CMAKE_CXX_FLAGS")
+set(TEST_SUITE_EXTRA_EXE_LINKER_FLAGS CACHE STRING
+    "Extra flags for CMAKE_EXE_LINKER_FLAGS")
+mark_as_advanced(TEST_SUITE_EXTRA_C_FLAGS, TEST_SUITE_EXTRA_CXX_FLAGS,
+                 TEST_SUITE_EXTRA_EXE_LINKER_FLAGS)
+set(CMAKE_C_CFLAGS "${CMAKE_C_CFLAGS} ${TEST_SUITE_EXTRA_C_FLAGS}")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TEST_SUITE_EXTRA_CXX_FLAGS}")
+set(CMAKE_EXE_LINKER_FLAGS
+    "${CMAKE_EXE_LINKER_FLAGS} ${TEST_SUITE_EXTRA_EXE_LINKER_FLAGS}")
+
 include(TestSuite)
 include(SingleMultiSource)
 find_package(TCL)