From: maier Date: Wed, 20 Feb 2013 10:55:01 +0000 (+0000) Subject: Minor cosmetic changes on output X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f60c96e37278ad890f12d0b8833452f7dc8934e;p=dealii-svn.git Minor cosmetic changes on output git-svn-id: https://svn.dealii.org/branches/branch_cmake@28490 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/CMakeLists.txt b/deal.II/CMakeLists.txt index 319173bf18..343be8cb94 100644 --- a/deal.II/CMakeLists.txt +++ b/deal.II/CMakeLists.txt @@ -1,6 +1,6 @@ ##### ## -## Copyright (C) 2012 by the deal.II authors +## Copyright (C) 2012, 2013 by the deal.II authors ## ## This file is part of the deal.II library. ## @@ -32,6 +32,7 @@ SET(VERSION "8.0.pre") # General configuration for cmake: # CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8) +MESSAGE(STATUS "This is CMake ${CMAKE_VERSION}") SET(CMAKE_INCLUDE_CURRENT_DIR true) @@ -45,10 +46,8 @@ LIST(APPEND CMAKE_MODULE_PATH # FILE(GLOB _macro_files "cmake/macros/*.cmake") FOREACH(_file ${_macro_files}) - MESSAGE(STATUS "Include ${_file}") INCLUDE(${_file}) ENDFOREACH() - INCLUDE(setup_external_macros) # diff --git a/deal.II/cmake/setup_compiler_flags.cmake b/deal.II/cmake/setup_compiler_flags.cmake index c2524fdecc..e0287049e5 100644 --- a/deal.II/cmake/setup_compiler_flags.cmake +++ b/deal.II/cmake/setup_compiler_flags.cmake @@ -1,6 +1,6 @@ ##### ## -## Copyright (C) 2012 by the deal.II authors +## Copyright (C) 2012, 2013 by the deal.II authors ## ## This file is part of the deal.II library. ## @@ -71,6 +71,7 @@ IF(DEAL_II_SETUP_DEFAULT_COMPILER_FLAGS) # # *Hooray* We are allowed to set compiler flags :-] # + MESSAGE(STATUS "") MESSAGE(STATUS "Set up default compiler flags.") # @@ -83,18 +84,21 @@ IF(DEAL_II_SETUP_DEFAULT_COMPILER_FLAGS) ENDIF() # - # Setup for ICC (version >= 10) compiler: + # Setup for ICC compiler (version >= 10): # IF(CMAKE_CXX_COMPILER_ID MATCHES "Intel") INCLUDE(setup_compiler_flags_intel) SET(DEAL_II_KNOWN_COMPILER TRUE) ENDIF() - IF(CMAKE_CXX_COMPILER_ID MATCHES "MSVC") + # + # Setup for MSVC compiler (version >= 2012): + # + IF(CMAKE_CXX_COMPILER_ID MATCHES "MSVC") INCLUDE(setup_compiler_flags_msvc) SET(DEAL_II_KNOWN_COMPILER TRUE) ENDIF() - + IF(NOT DEAL_II_KNOWN_COMPILER) MESSAGE(FATAL_ERROR "\n" "Unknown compiler!\n" diff --git a/deal.II/cmake/setup_finalize.cmake b/deal.II/cmake/setup_finalize.cmake index ef601f6aa4..7dfbb98efd 100644 --- a/deal.II/cmake/setup_finalize.cmake +++ b/deal.II/cmake/setup_finalize.cmake @@ -1,6 +1,6 @@ ##### ## -## Copyright (C) 2012 by the deal.II authors +## Copyright (C) 2012, 2013 by the deal.II authors ## ## This file is part of the deal.II library. ## @@ -62,11 +62,11 @@ SET(_log "${CMAKE_BINARY_DIR}/summary.log") FILE(WRITE ${_log} "### # -# deal.II configuration: +# ${DEAL_II_PACKAGE_NAME} configuration: # # CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE} # CMAKE_INSTALL_PREFIX: ${CMAKE_INSTALL_PREFIX} -# CMAKE_SOURCE_DIR: ${CMAKE_SOURCE_DIR} +# CMAKE_SOURCE_DIR: ${CMAKE_SOURCE_DIR} (Version ${DEAL_II_PACKAGE_VERSION}) # CMAKE_BINARY_DIR: ${CMAKE_BINARY_DIR} # CMAKE_CXX_COMPILER: ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION} on platform ${CMAKE_SYSTEM_NAME} # ${CMAKE_CXX_COMPILER}