CMake: Add CONFIG to the output dir if MSVC

[openssl-gost/engine.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e1c4e1dd450ecc05751288ce23e2986d12ec32b2..c31469176a5b8365e8501b5dadd8266670e67b19 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -88,7 +88,11 @@ if (NOT RELAXED_ALIGNMENT)
   add_definitions(-DSTRICT_ALIGNMENT)
 endif()
 
-set(BIN_DIRECTORY bin)
+if(MSVC)
+  set(BIN_DIRECTORY bin/$<CONFIG>/)
+else()
+  set(BIN_DIRECTORY bin)
+endif()
 
 set(OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BIN_DIRECTORY})
 
@@ -290,8 +294,9 @@ add_test(NAME gost89 COMMAND test_gost89)
 
 if(NOT SKIP_PERL_TESTS)
     execute_process(COMMAND perl -MTest2::V0 -e ""
-       ERROR_QUIET RESULT_VARIABLE HAVE_TEST2_V0)
-    if(NOT HAVE_TEST2_V0)
+       ERROR_QUIET RESULT_VARIABLE MISSING_TEST2_V0)
+    find_program(HAVE_PROVE NAMES prove)
+    if(NOT MISSING_TEST2_V0 AND HAVE_PROVE)
        add_test(NAME engine
            COMMAND prove --merge -PWrapOpenSSL ${CMAKE_CURRENT_SOURCE_DIR}/test :: engine)
        set_tests_properties(engine PROPERTIES ENVIRONMENT "${TEST_ENVIRONMENT_ENGINE}")