[geode-native] branch develop updated: GEODE-9511: Update ACE cmake config for VS2019 (#847)

[mmartell]

This is an automated email from the ASF dual-hosted git repository.

mmartell pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-native.git


The following commit(s) were added to refs/heads/develop by this push:
     new 9221b91  GEODE-9511: Update ACE cmake config for VS2019 (#847)
9221b91 is described below

commit 9221b915bcb6dbac468fa0f1232163f48b3034b4
Author: Michael Martell <mmart...@pivotal.io>
AuthorDate: Wed Aug 18 21:28:53 2021 -0700

    GEODE-9511: Update ACE cmake config for VS2019 (#847)
---
 dependencies/ACE/CMakeLists.txt | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/dependencies/ACE/CMakeLists.txt b/dependencies/ACE/CMakeLists.txt
index dd546e3..ee2c042 100644
--- a/dependencies/ACE/CMakeLists.txt
+++ b/dependencies/ACE/CMakeLists.txt
@@ -79,7 +79,7 @@ if (${WIN32})
   set ( _CONFIGURE_COMMAND ${MPC} -static ${MPC_FLAGS}
                            -name_modifier "*_${MPC_TYPE}_static"
                            -value_template MultiProcessorCompilation=true
-                           -value_template 
WindowsTargetPlatformVersion=${CMAKE_SYSTEM_VERSION}
+                           -value_template 
WindowsTargetPlatformVersion=${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}
                            -value_template staticflags+=__ACE_INLINE__
                            -value_template staticflags+=ACE_BUILD_DLL
                            -value_template staticflags+=ACE_AS_STATIC_LIBS
@@ -89,9 +89,14 @@ if (${WIN32})
   )
   set ( _INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory <SOURCE_DIR>/lib 
<INSTALL_DIR>/lib
                  COMMAND ${CMAKE_COMMAND} -E copy_directory <SOURCE_DIR>/ace 
<INSTALL_DIR>/include/ace
-                 COMMAND ${CMAKE_COMMAND} -E copy 
<SOURCE_DIR>/ace/Static_$<$<CONFIG:Debug>:Debug>$<$<NOT:$<CONFIG:Debug>>:Release>/ace_${MPC_TYPE}_static/AMD64/ACE_${MPC_TYPE}_static.pdb
 <INSTALL_DIR>/lib
   )
 
+  if(MSVC_TOOLSET_VERSION LESS 142)
+    set ( _INSTALL_COMMAND ${_INSTALL_COMMAND}
+                   COMMAND ${CMAKE_COMMAND} -E copy 
<SOURCE_DIR>/ace/Static_$<$<CONFIG:Debug>:Debug>$<$<NOT:$<CONFIG:Debug>>:Release>/ace_${MPC_TYPE}_static/AMD64/ACE_${MPC_TYPE}_static.pdb
 <INSTALL_DIR>/lib
+    )
+  endif()
+
   set(CMAKE_STATIC_LIBRARY_SUFFIX s$<${MSVC}:$<$<CONFIG:Debug>:d>>.lib)
 
 else()