Skip to content

Map MinSizeRel and RelWithDebInfo correctly #6393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dan-shaw merged 7 commits into from
Jan 9, 2020
Merged

Map MinSizeRel and RelWithDebInfo correctly #6393

Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
924d305
Map MinSizeRel and RelWithDebInfo to Release by default
Neumann-A May 10, 2019
bcadebc
switch to CMAKE_CONFIGURATION_TYPES
Neumann-A May 10, 2019
7d917e2
changed mapping slightly
Neumann-A May 10, 2019
347e777
add empty list element to the mapping
Neumann-A May 11, 2019
8225d37
more comments and an option to turn verbose messages on.
Neumann-A May 12, 2019
82f7183
removed line info.
Neumann-A May 12, 2019
96ab707
Merge branch 'master' into patch-8
Neumann-A Sep 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions scripts/buildsystems/vcpkg.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,18 @@ if(VCPKG_TOOLCHAIN)
return()
endif()

if(DEFINED CMAKE_CONFIGURATION_TYPES)
#Generating with a multi config generator
#Thus we should map common configurations correctly (If they have not been set manually)
message(STATUS "VCPKG: Multi configuration generator detected! Mapping MinSizeRel and RelWithDebInfo correctly!")
if(NOT DEFINED CMAKE_MAP_IMPORTED_CONFIG_MINSIZEREL)
set(CMAKE_MAP_IMPORTED_CONFIG_MINSIZEREL "MinSizeRel;Release;")
endif()
if(NOT DEFINED CMAKE_MAP_IMPORTED_CONFIG_RELWITHDEBINFO)
set(CMAKE_MAP_IMPORTED_CONFIG_RELWITHDEBINFO "RelWithDebInfo;Release;")
endif()
endif()

if(VCPKG_TARGET_TRIPLET)
elseif(CMAKE_GENERATOR_PLATFORM MATCHES "^[Ww][Ii][Nn]32$")
set(_VCPKG_TARGET_TRIPLET_ARCH x86)
Expand Down