Some more fixes for Win64

git-svn-id: https://svn.dealii.org/trunk@31510 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/bundled/umfpack/AMD/Include/UFconfig.h b/deal.II/bundled/umfpack/AMD/Include/UFconfig.h
index 91bbeac32ceae4768cf314c4355ffc3ba0e8df6d..6d4315d4fbe0f591730f7aa499bc06afc0eee990 100644 (file)
--- a/deal.II/bundled/umfpack/AMD/Include/UFconfig.h
+++ b/deal.II/bundled/umfpack/AMD/Include/UFconfig.h
@@ -49,19 +49,10 @@ extern "C" {
 
 #ifndef UF_long
 
-#ifdef _WIN64
-
-#define UF_long __int64
-#define UF_long_max _I64_MAX
-#define UF_long_id "%I64d"
-
-#else
-
 #define UF_long long
 #define UF_long_max LONG_MAX
 #define UF_long_id "%ld"
 
-#endif
 #endif
 
 /* ========================================================================== */

diff --git a/deal.II/bundled/umfpack/UMFPACK/Include/UFconfig.h b/deal.II/bundled/umfpack/UMFPACK/Include/UFconfig.h
index 91bbeac32ceae4768cf314c4355ffc3ba0e8df6d..6d4315d4fbe0f591730f7aa499bc06afc0eee990 100644 (file)
--- a/deal.II/bundled/umfpack/UMFPACK/Include/UFconfig.h
+++ b/deal.II/bundled/umfpack/UMFPACK/Include/UFconfig.h
@@ -49,19 +49,10 @@ extern "C" {
 
 #ifndef UF_long
 
-#ifdef _WIN64
-
-#define UF_long __int64
-#define UF_long_max _I64_MAX
-#define UF_long_id "%I64d"
-
-#else
-
 #define UF_long long
 #define UF_long_max LONG_MAX
 #define UF_long_id "%ld"
 
-#endif
 #endif
 
 /* ========================================================================== */

diff --git a/deal.II/cmake/checks/check_02_system_features.cmake b/deal.II/cmake/checks/check_02_system_features.cmake
index 562e174f67bb5c06a8bc51519203693f8b701994..cc0c675a6adf58ec47f9502524572f79158c547f 100644 (file)
--- a/deal.II/cmake/checks/check_02_system_features.cmake
+++ b/deal.II/cmake/checks/check_02_system_features.cmake
@@ -146,6 +146,10 @@ IF( CMAKE_SYSTEM_NAME MATCHES "CYGWIN"
 
     ENABLE_IF_SUPPORTED(DEAL_II_CXX_FLAGS_RELEASE "-g")
     ENABLE_IF_SUPPORTED(DEAL_II_LINKER_FLAGS_RELEASE "-g")
+    REPLACE_FLAG(DEAL_II_CXX_FLAGS_DEBUG "-Og" "-O1")
+    REPLACE_FLAG(DEAL_II_CXX_FLAGS_DEBUG "-O0" "-O1")
+    REPLACE_FLAG(DEAL_II_CXX_FLAGS_DEBUG "-ggdb" "-g")
+    REPLACE_FLAG(DEAL_II_LINKER_FALGS_DEBUG "-ggdb" "-g")
 
   ENDIF()
 ENDIF()

diff --git a/deal.II/cmake/macros/macro_replace_flag.cmake b/deal.II/cmake/macros/macro_replace_flag.cmake
index 22dd7bafa0699d58a2b4504c555fa828a6273af7..a8ccd294e7866594283fde98a69f26edc94803f2 100644 (file)
--- a/deal.II/cmake/macros/macro_replace_flag.cmake
+++ b/deal.II/cmake/macros/macro_replace_flag.cmake
@@ -19,7 +19,7 @@
 # variable.
 #
 # Usage:
-#     STRIP_FLAG(variable flag replacement)
+#     REPLACE_FLAG(variable flag replacement)
 #
 
 MACRO(REPLACE_FLAG _variable _flag _replacement)