summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-07-25 12:36:55 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2013-07-25 12:36:55 (GMT)
commit6b92e93b6d39eef8cccc58761cf9738f4195ba9d (patch)
tree1dc04f3b9e1d36968cfdc7d0f98751bb2cf93472 /Source
parent6b184d1607414d8009c90dbe70a8355262e14174 (diff)
parent41bb95fc673d3c5a151dcca82638fc1d7cec15ee (diff)
downloadCMake-6b92e93b6d39eef8cccc58761cf9738f4195ba9d.zip
CMake-6b92e93b6d39eef8cccc58761cf9738f4195ba9d.tar.gz
CMake-6b92e93b6d39eef8cccc58761cf9738f4195ba9d.tar.bz2
Merge topic 'doc-CMAKE_lang_FLAGS'
41bb95f Document CMAKE_<LANG>_FLAGS variable (#14305)
Diffstat (limited to 'Source')
-rw-r--r--Source/cmDocumentVariables.cxx8
1 files changed, 6 insertions, 2 deletions
diff --git a/Source/cmDocumentVariables.cxx b/Source/cmDocumentVariables.cxx
index fcaa169..cfd5e76 100644
--- a/Source/cmDocumentVariables.cxx
+++ b/Source/cmDocumentVariables.cxx
@@ -1622,6 +1622,12 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
"Variables for Languages");
cm->DefineProperty
+ ("CMAKE_<LANG>_FLAGS", cmProperty::VARIABLE,
+ "Flags for all build types.",
+ "<LANG> flags used regardless of the value of CMAKE_BUILD_TYPE.",false,
+ "Variables for Languages");
+
+ cm->DefineProperty
("CMAKE_<LANG>_FLAGS_DEBUG", cmProperty::VARIABLE,
"Flags for Debug build type or configuration.",
"<LANG> flags used when CMAKE_BUILD_TYPE is Debug.",false,
@@ -1862,8 +1868,6 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
cmProperty::VARIABLE,0,0);
cm->DefineProperty("CMAKE_<LANG>_CREATE_PREPROCESSED_SOURCE",
cmProperty::VARIABLE,0,0);
- cm->DefineProperty("CMAKE_<LANG>_FLAGS",
- cmProperty::VARIABLE,0,0);
cm->DefineProperty("CMAKE_<LANG>_FLAGS_DEBUG_INIT",
cmProperty::VARIABLE,0,0);
cm->DefineProperty("CMAKE_<LANG>_FLAGS_INIT",