From: maier Date: Fri, 5 Oct 2012 16:53:33 +0000 (+0000) Subject: Cosmetic changes X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=82b97b0ad929b86918d755de718de3c82e9e9d22;p=dealii-svn.git Cosmetic changes git-svn-id: https://svn.dealii.org/branches/branch_cmake@26973 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/cmake/setup_compiler_flags.cmake b/deal.II/cmake/setup_compiler_flags.cmake index a92de7262b..ddadf2c5ad 100644 --- a/deal.II/cmake/setup_compiler_flags.cmake +++ b/deal.II/cmake/setup_compiler_flags.cmake @@ -92,9 +92,11 @@ IF(DEAL_II_SETUP_DEFAULT_COMPILER_FLAGS) IF(NOT DEAL_II_KNOWN_COMPILER) - MESSAGE(WARNING "\n" - "Unrecognized compiler!\n" - "Please set the relevant compiler options by hand.\n") + MESSAGE(FATAL_ERROR "\n" + "Unknown compiler!\n" + "If you're serious about it, set DEAL_II_SETUP_DEFAULT_COMPILER_FLAGS=OFF " + "and set the relevant compiler options by hand.\n\n" + ) ENDIF() ELSE(DEAL_II_SETUP_DEFAULT_COMPILER_FLAGS) diff --git a/deal.II/cmake/setup_compiler_flags_gnu.cmake b/deal.II/cmake/setup_compiler_flags_gnu.cmake index a25b235ccc..3665e056b4 100644 --- a/deal.II/cmake/setup_compiler_flags_gnu.cmake +++ b/deal.II/cmake/setup_compiler_flags_gnu.cmake @@ -102,11 +102,11 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Darwin") ENDIF() -############################## -# # -# For Release targets: # -# # -############################## +############################# +# # +# For Release target: # +# # +############################# IF (CMAKE_BUILD_TYPE MATCHES "Release") # diff --git a/deal.II/cmake/setup_compiler_flags_intel.cmake b/deal.II/cmake/setup_compiler_flags_intel.cmake index 9f7247292f..73c7707221 100644 --- a/deal.II/cmake/setup_compiler_flags_intel.cmake +++ b/deal.II/cmake/setup_compiler_flags_intel.cmake @@ -66,11 +66,11 @@ ENABLE_IF_SUPPORTED(CMAKE_CXX_FLAGS "-wd177") ENABLE_IF_SUPPORTED(CMAKE_CXX_FLAGS "-wd1478") -############################## -# # -# For Release targets: # -# # -############################## +############################# +# # +# For Release target: # +# # +############################# IF (CMAKE_BUILD_TYPE MATCHES "Release") # diff --git a/deal.II/cmake/setup_deal_ii.cmake b/deal.II/cmake/setup_deal_ii.cmake index bff486cbbd..6216ee58b8 100644 --- a/deal.II/cmake/setup_deal_ii.cmake +++ b/deal.II/cmake/setup_deal_ii.cmake @@ -100,6 +100,7 @@ OPTION(DEAL_II_SETUP_DEFAULT_COMPILER_FLAGS "configure sensible default CFLAGS and CXXFLAGS depending on platform, compiler and build target." ON ) +MARK_AS_ADVANCED(DEAL_II_SETUP_DEFAULT_COMPILER_FLAGS) # # Component selection: configuration options regarding the setup of @@ -160,7 +161,7 @@ SET(DEAL_II_PROJECT_CONFIG_NAME "${DEAL_II_PACKAGE_NAME}") SET_IF_EMPTY(DEAL_II_BASE_NAME "deal_II") SET_IF_EMPTY(DEAL_II_DEBUG_SUFFIX ".g") -SET_IF_EMPTY(DEAL_II_RELEASE_SUFFIX ".o") +SET_IF_EMPTY(DEAL_II_RELEASE_SUFFIX "") SET(DEAL_II_PATH ${CMAKE_INSTALL_PREFIX})