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

aboda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git


The following commit(s) were added to refs/heads/master by this push:
     new 90e6cda  MINIFICPP-1189 win/debug: expect correct yaml lib
90e6cda is described below

commit 90e6cda97b66944cb2abf722c443e58dd237c208
Author: Marton Szasz <szasz...@gmail.com>
AuthorDate: Tue Apr 7 03:58:50 2020 -0400

    MINIFICPP-1189 win/debug: expect correct yaml lib
    
    Signed-off-by: Arpad Boda <ab...@apache.org>
    
    This closes #751
---
 cmake/BundledYamlCpp.cmake | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/cmake/BundledYamlCpp.cmake b/cmake/BundledYamlCpp.cmake
index 0c9a3f4..f486681 100644
--- a/cmake/BundledYamlCpp.cmake
+++ b/cmake/BundledYamlCpp.cmake
@@ -18,7 +18,11 @@
 function(use_bundled_yamlcpp SOURCE_DIR BINARY_DIR)
     # Define byproducts
     if (WIN32)
-        set(BYPRODUCT "lib/libyaml-cppmd.lib")
+        if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
+            set(BYPRODUCT "lib/libyaml-cppmdd.lib")
+        else()
+            set(BYPRODUCT "lib/libyaml-cppmd.lib")
+        endif()
     else()
         set(BYPRODUCT "lib/libyaml-cpp.a")
     endif()

Reply via email to