From: maier Date: Sat, 2 Nov 2013 11:33:24 +0000 (+0000) Subject: Some more fixes for Win64 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af2310917b3475717237179611f0dae9fb94cf28;p=dealii-svn.git 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 91bbeac32c..6d4315d4fb 100644 --- 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 91bbeac32c..6d4315d4fb 100644 --- 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 562e174f67..cc0c675a6a 100644 --- 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 22dd7bafa0..a8ccd294e7 100644 --- 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)