mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-01 20:00:51 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'vs-rc-flags'

Browse Source 
974f4333 VS: Fix support for rc /nologo flag in per-source COMPILE_FLAGS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !998
This commit is contained in:
Brad King
2017-06-22 14:13:37 +00:00
committed by Kitware Robot
parent 751f0e0adc 974f43338b
commit 426c83cf8f
5 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmVS10RCFlagTable.h
+1
View File
@@ -1,6 +1,7 @@
static cmVS7FlagTable cmVS10RCFlagTable[] = {
// Bool Properties
{ "NullTerminateStrings", "n", "", "true", 0 },
{ "SuppressStartupBanner", "nologo", "", "true", 0 },
{ 0, 0, 0, 0, 0 }
};
Source/cmVS11RCFlagTable.h
+1
View File
@@ -1,6 +1,7 @@
static cmVS7FlagTable cmVS11RCFlagTable[] = {
// Bool Properties
{ "NullTerminateStrings", "n", "", "true", 0 },
{ "SuppressStartupBanner", "nologo", "", "true", 0 },
{ 0, 0, 0, 0, 0 }
};
Source/cmVS12RCFlagTable.h
+1
View File
@@ -1,6 +1,7 @@
static cmVS7FlagTable cmVS12RCFlagTable[] = {
// Bool Properties
{ "NullTerminateStrings", "n", "", "true", 0 },
{ "SuppressStartupBanner", "nologo", "", "true", 0 },
{ 0, 0, 0, 0, 0 }
};
Source/cmVS14RCFlagTable.h
+1
View File
@@ -1,6 +1,7 @@
static cmVS7FlagTable cmVS14RCFlagTable[] = {
// Bool Properties
{ "NullTerminateStrings", "n", "", "true", 0 },
{ "SuppressStartupBanner", "nologo", "", "true", 0 },
{ 0, 0, 0, 0, 0 }
};
Tests/VSResource/CMakeLists.txt
+4
View File
@@ -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")