diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2019-02-26 18:56:59 +0100 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-02-26 09:56:59 -0800 |
| commit | 7b54d8ec11125d8cdeb48d1431808c1d908d59c4 (patch) | |
| tree | cb58ad6079e947f057a207000257f6cdde99bce3 | |
| parent | aa909090ace63e19ff738f3062e32c3b275a3da3 (diff) | |
| download | vcpkg-7b54d8ec11125d8cdeb48d1431808c1d908d59c4.tar.gz vcpkg-7b54d8ec11125d8cdeb48d1431808c1d908d59c4.zip | |
[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
| -rw-r--r-- | ports/ace/portfile.cmake | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake index 95fc09dce..f3dcbc6bf 100644 --- a/ports/ace/portfile.cmake +++ b/ports/ace/portfile.cmake @@ -23,11 +23,17 @@ else () set(MSBUILD_PLATFORM ${TRIPLET_SYSTEM_ARCH}) endif() +if(VCPKG_PLATFORM_TOOLSET MATCHES "v141") + set(SOLUTION_TYPE vs2017) +else() + set(SOLUTION_TYPE vc14) +endif() + # Add ace/config.h file # 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\"") vcpkg_build_msbuild( - PROJECT_PATH ${SOURCE_PATH}/ace_vc14.sln + PROJECT_PATH ${SOURCE_PATH}/ace_${SOLUTION_TYPE}.sln PLATFORM ${MSBUILD_PLATFORM} ) |