Forráskód Böngészése

Merge topic 'vs-rc-flags'

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

Acked-by: Kitware Robot <[email protected]>
Merge-request: !998
Brad King 8 éve
szülő
commit
426c83cf8f

+ 1 - 0
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 }
 };

+ 1 - 0
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 }
 };

+ 1 - 0
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 }
 };

+ 1 - 0
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 }
 };

+ 4 - 0
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")