From d4bc4b30a0c9bfeb69e7ac8e8dab3b9428df38ed Mon Sep 17 00:00:00 2001
From: "Charlton, Scott R" <charlton@usgs.gov>
Date: Mon, 21 Sep 2020 21:24:00 -0600
Subject: [PATCH] Changed POST_BUILD to PRE_BUILD for when to copy dlls

---
 gtest/CMakeLists.txt | 50 +++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 47 insertions(+), 3 deletions(-)

diff --git a/gtest/CMakeLists.txt b/gtest/CMakeLists.txt
index ee3fe02d..53781187 100644
--- a/gtest/CMakeLists.txt
+++ b/gtest/CMakeLists.txt
@@ -24,15 +24,59 @@ gtest_discover_tests(TestSelectedOutput)
 
 if (MSVC AND BUILD_SHARED_LIBS)
   # copy dlls
-  add_custom_command(TARGET TestCVar POST_BUILD
+  add_custom_command(TARGET TestCVar PRE_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:IPhreeqc> $<TARGET_FILE_DIR:TestCVar>
     )
-  add_custom_command(TARGET TestCVar POST_BUILD
+  add_custom_command(TARGET TestCVar PRE_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:gtest> $<TARGET_FILE_DIR:TestCVar>
     )
-  add_custom_command(TARGET TestCVar POST_BUILD
+  add_custom_command(TARGET TestCVar PRE_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:gtest_main> $<TARGET_FILE_DIR:TestCVar>
     )
+
+  # copy dlls
+  add_custom_command(TARGET TestVar PRE_BUILD
+    COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:IPhreeqc> $<TARGET_FILE_DIR:TestVar>
+    )
+  add_custom_command(TARGET TestVar PRE_BUILD
+    COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:gtest> $<TARGET_FILE_DIR:TestVar>
+    )
+  add_custom_command(TARGET TestVar PRE_BUILD
+    COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:gtest_main> $<TARGET_FILE_DIR:TestVar>
+    )
+
+  # copy dlls
+  add_custom_command(TARGET TestIPhreeqcLib PRE_BUILD
+    COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:IPhreeqc> $<TARGET_FILE_DIR:TestIPhreeqcLib>
+    )
+  add_custom_command(TARGET TestIPhreeqcLib PRE_BUILD
+    COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:gtest> $<TARGET_FILE_DIR:TestIPhreeqcLib>
+    )
+  add_custom_command(TARGET TestIPhreeqcLib PRE_BUILD
+    COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:gtest_main> $<TARGET_FILE_DIR:TestIPhreeqcLib>
+    )
+
+  # copy dlls
+  add_custom_command(TARGET TestIPhreeqc PRE_BUILD
+    COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:IPhreeqc> $<TARGET_FILE_DIR:TestIPhreeqc>
+    )
+  add_custom_command(TARGET TestIPhreeqc PRE_BUILD
+    COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:gtest> $<TARGET_FILE_DIR:TestIPhreeqc>
+    )
+  add_custom_command(TARGET TestIPhreeqc PRE_BUILD
+    COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:gtest_main> $<TARGET_FILE_DIR:TestIPhreeqc>
+    )
+
+  # copy dlls
+  add_custom_command(TARGET TestSelectedOutput PRE_BUILD
+    COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:IPhreeqc> $<TARGET_FILE_DIR:TestSelectedOutput>
+    )
+  add_custom_command(TARGET TestSelectedOutput PRE_BUILD
+    COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:gtest> $<TARGET_FILE_DIR:TestSelectedOutput>
+    )
+  add_custom_command(TARGET TestSelectedOutput PRE_BUILD
+    COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:gtest_main> $<TARGET_FILE_DIR:TestSelectedOutput>
+    )
 endif()