From a5a37ee9bc28badd36bd8a057df7ee2f5cd5743b Mon Sep 17 00:00:00 2001
From: rinkk <karsten.rink@ufz.de>
Date: Tue, 17 Oct 2017 10:41:59 +0200
Subject: [PATCH] Win Debug fixes.
---
Applications/DataExplorer/DataExplorer.cmake | 2 +-
BaseLib/MemWatch.cpp | 4 ++--
scripts/cmake/CompilerSetup.cmake | 2 ++
scripts/cmake/conan/conan.cmake | 2 +-
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/Applications/DataExplorer/DataExplorer.cmake b/Applications/DataExplorer/DataExplorer.cmake
index b40fc169372..d7f1353aa5a 100644
--- a/Applications/DataExplorer/DataExplorer.cmake
+++ b/Applications/DataExplorer/DataExplorer.cmake
@@ -67,7 +67,7 @@ target_link_libraries(DataExplorer
)
# Workaround for Windows conan tiff-package
-if(USE_CONAN AND WIN32)
+if(OGS_USE_CONAN AND WIN32)
find_package(ZLIB REQUIRED)
target_link_libraries(DataExplorer ${ZLIB_LIBRARIES})
endif()
diff --git a/BaseLib/MemWatch.cpp b/BaseLib/MemWatch.cpp
index 0e8947fd673..101fbee2368 100644
--- a/BaseLib/MemWatch.cpp
+++ b/BaseLib/MemWatch.cpp
@@ -14,7 +14,7 @@
#include "MemWatch.h"
-#if !defined(WIN32) && !defined(__APPLE__) && !defined(__MINGW32__)
+#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__MINGW32__)
#include <fstream>
#include <string>
#include <sstream>
@@ -31,7 +31,7 @@ MemWatch::MemWatch ()
unsigned MemWatch::updateMemUsage ()
{
-#if !defined(WIN32) && !defined(__APPLE__) && !defined(__MINGW32__)
+#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__MINGW32__)
std::string fname ("/proc/");
std::stringstream str_pid;
str_pid << static_cast<unsigned> (getpid());
diff --git a/scripts/cmake/CompilerSetup.cmake b/scripts/cmake/CompilerSetup.cmake
index 95ced845a51..e7cda0f899a 100644
--- a/scripts/cmake/CompilerSetup.cmake
+++ b/scripts/cmake/CompilerSetup.cmake
@@ -138,6 +138,8 @@ if(WIN32)
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} \
/ZI /Od /Ob0")
+ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MDd")
+
DisableCompilerFlag(DEBUG /RTC1)
# cygwin
else()
diff --git a/scripts/cmake/conan/conan.cmake b/scripts/cmake/conan/conan.cmake
index 6bf355531a0..6b8e36d8137 100644
--- a/scripts/cmake/conan/conan.cmake
+++ b/scripts/cmake/conan/conan.cmake
@@ -176,7 +176,7 @@ function(conan_cmake_detect_vs_runtime result)
string(TOUPPER ${CMAKE_BUILD_TYPE} build_type)
set(variables CMAKE_CXX_FLAGS_${build_type} CMAKE_C_FLAGS_${build_type} CMAKE_CXX_FLAGS CMAKE_C_FLAGS)
foreach(variable ${variables})
- string(REPLACE " " ";" flags ${${variable}})
+ string(REPLACE " " ";" flags ${variable})
foreach (flag ${flags})
if(${flag} STREQUAL "/MD" OR ${flag} STREQUAL "/MDd" OR ${flag} STREQUAL "/MT" OR ${flag} STREQUAL "/MTd")
string(SUBSTRING ${flag} 1 -1 runtime)
--
GitLab