From 4e1b9f297dbebbd5a456984028a7bacb2ab29995 Mon Sep 17 00:00:00 2001
From: Soeren Peters <peters@irmb.tu-bs.de>
Date: Thu, 20 Aug 2020 10:11:09 +0200
Subject: [PATCH] Fix Cygwin define usage. Add NOMINMAX definition to the top
level cmake.
---
CMakeLists.txt | 3 +++
cpu.cmake | 2 +-
src/basics/basics/utilities/UbSystem.h | 6 +++---
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f031956ba..331e7fe3a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,6 +43,9 @@ include("${CMAKE_PATH}/VirtualFluidsMacros.cmake")
#################################################################################
# COMMON LIBRARIES
#################################################################################
+if(MSVC)
+ ADD_DEFINITIONS ( "-DNOMINMAX" ) # Disable Min/Max-Macros
+endif()
add_subdirectory(src/basics)
#################################################################################
diff --git a/cpu.cmake b/cpu.cmake
index f04d9eb06..30b325445 100644
--- a/cpu.cmake
+++ b/cpu.cmake
@@ -1,7 +1,7 @@
SET(USE_INTEL OFF CACHE BOOL "include Intel compiler support")
-SET(USE_GCC ON CACHE BOOL "include gcc compiler support")
+SET(USE_GCC OFF CACHE BOOL "include gcc compiler support")
set (SOURCE_DIR ${PROJECT_SOURCE_DIR})
diff --git a/src/basics/basics/utilities/UbSystem.h b/src/basics/basics/utilities/UbSystem.h
index 2102bc52a..f726f841f 100644
--- a/src/basics/basics/utilities/UbSystem.h
+++ b/src/basics/basics/utilities/UbSystem.h
@@ -72,7 +72,7 @@
#define UBSYSTEM_CYGWIN
#include <windows.h>
#else
- #include <sys/syscall.h>
+ //#include <sys/syscall.h> // TODO: Did not work on windows!
#endif
#if defined(min) || defined(max) //daruch kann man sich spaeter #undef min; #undef max erparen
@@ -134,7 +134,7 @@ namespace UbSystem
/*==========================================================*/
inline void sleepS(const unsigned int& sec)
{
- #if defined(UBSYSTEM_WINDOWS) && defined(UBSYSTEM_CYGWIN)
+ #if defined(UBSYSTEM_WINDOWS) || defined(UBSYSTEM_CYGWIN)
::Sleep( (sec==0) ? 1 : sec*1000 ); // +1 here causes a context switch if sleepS(0) is called
#elif defined(UBSYSTEM_LINUX) || defined(UBSYSTEM_APPLE) || defined(UBSYSTEM_AIX) && !defined(UBSYSTEM_CYGWIN)
::sleep(sec);
@@ -459,7 +459,7 @@ namespace UbSystem
char Name[150];
int i = 0;
-#if defined(UBSYSTEM_WINDOWS) && defined(UBSYSTEM_CYGWIN)
+#if defined(UBSYSTEM_WINDOWS) || defined(UBSYSTEM_CYGWIN)
TCHAR infoBuf[150];
DWORD bufCharCount = 150;
memset(Name, 0, 150);
--
GitLab