diff options
| author | Brad King <brad.king@kitware.com> | 2017-06-22 09:52:28 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-06-22 09:52:28 -0400 |
| commit | c8ee5dbc0c9745ee6dadc1c18483a127bebd7962 (patch) | |
| tree | b4cda3e1aa3bab93314918ca95130f088e9c3c6b | |
| parent | 5ba09a75a25f0876596af39fa32eff69cc44e1d6 (diff) | |
| parent | 974f43338b09e6ae4342015e2cc088d751943cb0 (diff) | |
| download | cmake-c8ee5dbc0c9745ee6dadc1c18483a127bebd7962.tar.gz | |
Merge branch 'vs-rc-flags' into release-3.9
| -rw-r--r-- | Source/cmVS10RCFlagTable.h | 1 | ||||
| -rw-r--r-- | Source/cmVS11RCFlagTable.h | 1 | ||||
| -rw-r--r-- | Source/cmVS12RCFlagTable.h | 1 | ||||
| -rw-r--r-- | Source/cmVS14RCFlagTable.h | 1 | ||||
| -rw-r--r-- | Tests/VSResource/CMakeLists.txt | 4 |
5 files changed, 8 insertions, 0 deletions
diff --git a/Source/cmVS10RCFlagTable.h b/Source/cmVS10RCFlagTable.h index 32f35e52c3..6e2b8344c3 100644 --- a/Source/cmVS10RCFlagTable.h +++ b/Source/cmVS10RCFlagTable.h @@ -1,6 +1,7 @@ static cmVS7FlagTable cmVS10RCFlagTable[] = { // Bool Properties { "NullTerminateStrings", "n", "", "true", 0 }, + { "SuppressStartupBanner", "nologo", "", "true", 0 }, { 0, 0, 0, 0, 0 } }; diff --git a/Source/cmVS11RCFlagTable.h b/Source/cmVS11RCFlagTable.h index 666e4344a8..4997fe1157 100644 --- a/Source/cmVS11RCFlagTable.h +++ b/Source/cmVS11RCFlagTable.h @@ -1,6 +1,7 @@ static cmVS7FlagTable cmVS11RCFlagTable[] = { // Bool Properties { "NullTerminateStrings", "n", "", "true", 0 }, + { "SuppressStartupBanner", "nologo", "", "true", 0 }, { 0, 0, 0, 0, 0 } }; diff --git a/Source/cmVS12RCFlagTable.h b/Source/cmVS12RCFlagTable.h index d047f824b5..a650f8522e 100644 --- a/Source/cmVS12RCFlagTable.h +++ b/Source/cmVS12RCFlagTable.h @@ -1,6 +1,7 @@ static cmVS7FlagTable cmVS12RCFlagTable[] = { // Bool Properties { "NullTerminateStrings", "n", "", "true", 0 }, + { "SuppressStartupBanner", "nologo", "", "true", 0 }, { 0, 0, 0, 0, 0 } }; diff --git a/Source/cmVS14RCFlagTable.h b/Source/cmVS14RCFlagTable.h index 11e00d5131..5dc8d5adad 100644 --- a/Source/cmVS14RCFlagTable.h +++ b/Source/cmVS14RCFlagTable.h @@ -1,6 +1,7 @@ static cmVS7FlagTable cmVS14RCFlagTable[] = { // Bool Properties { "NullTerminateStrings", "n", "", "true", 0 }, + { "SuppressStartupBanner", "nologo", "", "true", 0 }, { 0, 0, 0, 0, 0 } }; diff --git a/Tests/VSResource/CMakeLists.txt b/Tests/VSResource/CMakeLists.txt index ee660edf9a..718e624412 100644 --- a/Tests/VSResource/CMakeLists.txt +++ b/Tests/VSResource/CMakeLists.txt @@ -50,5 +50,9 @@ add_library(ResourceLib STATIC lib.cpp lib.rc) add_executable(VSResource main.cpp test.rc) target_link_libraries(VSResource ResourceLib) +if(MSVC AND NOT MSVC_VERSION VERSION_LESS 1600) + set_property(SOURCE test.rc PROPERTY COMPILE_FLAGS /nologo) +endif() + set_property(TARGET VSResource PROPERTY VS_GLOBAL_CMakeTestVsGlobalVariable "test val") |