Merge pull request #1975 from bilke/win-fix

[CMake] Don't use x64 toolset on VS 2015, fixed Conan MDd linkage.

CMakeLists.txt

@@ -9,7 +9,9 @@ cmake_minimum_required(VERSION 3.1)
 cmake_policy(SET CMP0011 NEW)
 cmake_policy(SET CMP0054 NEW)
 
-if(WIN32 AND NOT ${CMAKE_GENERATOR} STREQUAL Ninja)
+if(WIN32 AND
+    NOT ${CMAKE_GENERATOR} STREQUAL Ninja AND
+    NOT ${CMAKE_GENERATOR} MATCHES 2015) # does not work on 2015
     # Force 64-bit VS compiler
     set(CMAKE_GENERATOR_TOOLSET host=x64)
 endif()

scripts/cmake/CMakeSetup.cmake

@@ -18,7 +18,8 @@ if(NOT PROJECT_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
     set(OGS_BUILD_CLI OFF CACHE BOOL "" FORCE)
 endif()
 
-if(NOT CMAKE_BUILD_TYPE AND (NOT CMAKE_CONFIGURATION_TYPES OR OGS_USE_CONAN))
+if((NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+    OR (NOT CMAKE_BUILD_TYPE AND MSVC AND OGS_USE_CONAN))
     message(STATUS "Setting build type to 'Debug' as none was specified.")
     set(CMAKE_BUILD_TYPE Debug CACHE STRING "Choose the type of build." FORCE)
     set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS