diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2020-06-11 22:43:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-11 13:43:24 -0700 |
| commit | c704058346b89b8f7b2c68f3162f0d4a86a47c0d (patch) | |
| tree | dd26987f17511cb52eb33c2467c8d1cc01e81a6f /scripts | |
| parent | 55d6bd1b7d1fab3515b3c7f18d2607906919d356 (diff) | |
| download | vcpkg-c704058346b89b8f7b2c68f3162f0d4a86a47c0d.tar.gz vcpkg-c704058346b89b8f7b2c68f3162f0d4a86a47c0d.zip | |
[vcpkg] Add nologo to windows toolchain (#11146)
* add nologo to windows toolchain
* bump control of one cmake port for ci testing
* [scripts] add nologo to _DEBUG flags
* revert version bump
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/toolchains/windows.cmake | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/scripts/toolchains/windows.cmake b/scripts/toolchains/windows.cmake index 43e6d2c2d..160e9d934 100644 --- a/scripts/toolchains/windows.cmake +++ b/scripts/toolchains/windows.cmake @@ -19,8 +19,8 @@ if(NOT _CMAKE_IN_TRY_COMPILE) set(CHARSET_FLAG)
endif()
- set(CMAKE_CXX_FLAGS " /DWIN32 /D_WINDOWS /W3 ${CHARSET_FLAG} /GR /EHsc /MP ${VCPKG_CXX_FLAGS}" CACHE STRING "")
- set(CMAKE_C_FLAGS " /DWIN32 /D_WINDOWS /W3 ${CHARSET_FLAG} /MP ${VCPKG_C_FLAGS}" CACHE STRING "")
+ set(CMAKE_CXX_FLAGS " /nologo /DWIN32 /D_WINDOWS /W3 ${CHARSET_FLAG} /GR /EHsc /MP ${VCPKG_CXX_FLAGS}" CACHE STRING "")
+ set(CMAKE_C_FLAGS " /nologo /DWIN32 /D_WINDOWS /W3 ${CHARSET_FLAG} /MP ${VCPKG_C_FLAGS}" CACHE STRING "")
set(CMAKE_RC_FLAGS "-c65001 /DWIN32" CACHE STRING "")
unset(CHARSET_FLAG)
@@ -29,8 +29,13 @@ if(NOT _CMAKE_IN_TRY_COMPILE) set(CMAKE_C_FLAGS_DEBUG "/D_DEBUG ${VCPKG_CRT_LINK_FLAG_PREFIX}d /Z7 /Ob0 /Od /RTC1 ${VCPKG_C_FLAGS_DEBUG}" CACHE STRING "")
set(CMAKE_CXX_FLAGS_RELEASE "${VCPKG_CRT_LINK_FLAG_PREFIX} /O2 /Oi /Gy /DNDEBUG /Z7 ${VCPKG_CXX_FLAGS_RELEASE}" CACHE STRING "")
set(CMAKE_C_FLAGS_RELEASE "${VCPKG_CRT_LINK_FLAG_PREFIX} /O2 /Oi /Gy /DNDEBUG /Z7 ${VCPKG_C_FLAGS_RELEASE}" CACHE STRING "")
-
- set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "/DEBUG /INCREMENTAL:NO /OPT:REF /OPT:ICF ${VCPKG_LINKER_FLAGS}" CACHE STRING "")
- set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/DEBUG /INCREMENTAL:NO /OPT:REF /OPT:ICF ${VCPKG_LINKER_FLAGS}" CACHE STRING "")
+
+ string(APPEND CMAKE_STATIC_LINKER_FLAGS_RELEASE_INIT " /nologo ")
+ set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "/nologo /DEBUG /INCREMENTAL:NO /OPT:REF /OPT:ICF ${VCPKG_LINKER_FLAGS}" CACHE STRING "")
+ set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/nologo /DEBUG /INCREMENTAL:NO /OPT:REF /OPT:ICF ${VCPKG_LINKER_FLAGS}" CACHE STRING "")
+
+ string(APPEND CMAKE_STATIC_LINKER_FLAGS_DEBUG_INIT " /nologo ")
+ string(APPEND CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT " /nologo ")
+ string(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT " /nologo ")
endif()
endif()
|