[ace] Select correct Visual Studio solution based on platform toolset (#5458)

* [ace] 6.5.4

* Added logic to select the correct solution for Visual Studio 2015 and 2017
This commit is contained in:
Johnny Willemsen 2019-02-26 18:56:59 +01:00 committed by Phil Christensen
parent aa909090ac
commit 7b54d8ec11

View File

@ -23,11 +23,17 @@ else ()
set(MSBUILD_PLATFORM ${TRIPLET_SYSTEM_ARCH}) set(MSBUILD_PLATFORM ${TRIPLET_SYSTEM_ARCH})
endif() endif()
if(VCPKG_PLATFORM_TOOLSET MATCHES "v141")
set(SOLUTION_TYPE vs2017)
else()
set(SOLUTION_TYPE vc14)
endif()
# Add ace/config.h file # Add ace/config.h file
# see http://www.dre.vanderbilt.edu/~schmidt/DOC_ROOT/ACE/ACE-INSTALL.html#win32 # see http://www.dre.vanderbilt.edu/~schmidt/DOC_ROOT/ACE/ACE-INSTALL.html#win32
file(WRITE ${SOURCE_PATH}/config.h "#include \"ace/config-windows.h\"") file(WRITE ${SOURCE_PATH}/config.h "#include \"ace/config-windows.h\"")
vcpkg_build_msbuild( vcpkg_build_msbuild(
PROJECT_PATH ${SOURCE_PATH}/ace_vc14.sln PROJECT_PATH ${SOURCE_PATH}/ace_${SOLUTION_TYPE}.sln
PLATFORM ${MSBUILD_PLATFORM} PLATFORM ${MSBUILD_PLATFORM}
) )