Whitespace and indenting fixups

diff --git a/cmake/cpack-mac-bundle/dealii-terminal.in b/cmake/cpack-mac-bundle/dealii-terminal.in
index d6bf1848cc017fe98e9eddd78968215252233fbf..383755815fac5855a4f7f42b94baf022ce8959b2 100755 (executable)
--- a/cmake/cpack-mac-bundle/dealii-terminal.in
+++ b/cmake/cpack-mac-bundle/dealii-terminal.in
@@ -23,9 +23,9 @@ else
 fi
 
 # Make sure DEAL_II_BUNDLE is set correctly
-if [ -z "$DEAL_II_BUNDLE" ]; then 
+if [ -z "$DEAL_II_BUNDLE" ]; then
     export DEAL_II_BUNDLE=/Applications/deal.II.app
-    if [ ! -d $DEAL_II_BUNDLE ]; then 
+    if [ ! -d $DEAL_II_BUNDLE ]; then
            return=`/usr/bin/osascript <<EOF
 tell app "System Events"
     Activate
@@ -36,7 +36,7 @@ EOF`
     fi
 fi
 
-if [ -z "$DEAL_II_RESOURCES" ]; then 
+if [ -z "$DEAL_II_RESOURCES" ]; then
     export DEAL_II_RESOURCES=$DEAL_II_BUNDLE/Contents/Resources
 fi
 

diff --git a/cmake/cpack-mac-bundle/dealii.conf.in b/cmake/cpack-mac-bundle/dealii.conf.in
index a31d84f72ab6e97d066cd065f9052327f4a0e9fb..2e935cfe6107f2d40d4fc8c92178d75003ec02ca 100644 (file)
--- a/cmake/cpack-mac-bundle/dealii.conf.in
+++ b/cmake/cpack-mac-bundle/dealii.conf.in
@@ -13,12 +13,12 @@
 ## ---------------------------------------------------------------------
 
 # Make sure DEAL_II_BUNDLE is set correctly
-if [ -z "$DEAL_II_BUNDLE" ]; then 
+if [ -z "$DEAL_II_BUNDLE" ]; then
     export DEAL_II_BUNDLE=/Applications/deal.II.app
-    if [ ! -d $DEAL_II_BUNDLE ]; then 
+    if [ ! -d $DEAL_II_BUNDLE ]; then
     cat << EOF
-*** Warning: I did not find the deal.II installation in $DEAL_II_BUNDLE. 
-    Could not set the environment to work with deal.II. Either reinstall 
+*** Warning: I did not find the deal.II installation in $DEAL_II_BUNDLE.
+    Could not set the environment to work with deal.II. Either reinstall
     or set the environment vairiable DEAL_II_BUNDLE to the correct value.
     Things may not work as you expect if you continue.
 EOF
@@ -26,7 +26,7 @@ EOF
 fi
 
 # Check if DEAL_II_RESOURCES is set, otherwise set it to the default
-if [ -z "$DEAL_II_RESOURCES" ]; then 
+if [ -z "$DEAL_II_RESOURCES" ]; then
     export DEAL_II_RESOURCES=$DEAL_II_BUNDLE/Contents/Resources
 fi
 
@@ -51,25 +51,25 @@ if [ -z "$DEAL_II_CONF_SILENT" ]; then
     # echo -n -e "\033]0;deal.II - an open source finite element library DEAL_II \007"
 
     cat << EOF
-       ______           _  _____ _____ 
-       |  _  \         | ||_   _|_   _|
-       | | | |___  __ _| |  | |   | |  
-       | | | / _ \/ _| | |  | |   | |  
-       | |/ /  __/ (_| | |__| |_ _| |_ 
-       |___/ \___|\__,_|_(_)___/ \___/ 
-                                
-This is a shell with PATH's and DYLD_LIBRARY_PATH setup to work with Deal.II. 
-If you are new to Deal.II you probably want to have a look at 
+        ______           _  _____ _____
+        |  _  \         | ||_   _|_   _|
+        | | | |___  __ _| |  | |   | |
+        | | | / _ \/ _| | |  | |   | |
+        | |/ /  __/ (_| | |__| |_ _| |_
+        |___/ \___|\__,_|_(_)___/ \___/
+
+This is a shell with PATH's and DYLD_LIBRARY_PATH setup to work with Deal.II.
+If you are new to Deal.II you probably want to have a look at
 
     $DEAL_II_RESOURCES/examples/
 
-For more information please visit the project website: 
+For more information please visit the project website:
 
 http://www.dealii.org
 
-If you want to set up your daily Terminal to work with deal.II, add 
+If you want to set up your daily Terminal to work with deal.II, add
 these lines to your ~/.profile file (the first line turns off this message):
-  
+
    export DEAL_II_CONF_SILENT=ON
    . $DEAL_II_RESOURCES/@DEAL_II_COMMON_RELDIR@/dealii.conf
 

diff --git a/cmake/setup_cpack.cmake b/cmake/setup_cpack.cmake
index ce64da422067a8341a9cbefb94a7499d944c29e0..4e5944775f2614b9b648de9321ecd47907710218 100644 (file)
--- a/cmake/setup_cpack.cmake
+++ b/cmake/setup_cpack.cmake
@@ -1,6 +1,6 @@
 ## ---------------------------------------------------------------------
 ##
-## Copyright (C) 2012 - 2014 by the deal.II authors
+## Copyright (C) 2014 by the deal.II authors
 ##
 ## This file is part of the deal.II library.
 ##
@@ -21,64 +21,65 @@ IF(DEAL_II_COMPONENT_PACKAGE)
     ${CMAKE_SOURCE_DIR}/cmake/cpack-mac-bundle/mac_startup_script.sh.in
     ${CMAKE_BINARY_DIR}/cpack/mac_startup_script.sh
     @ONLY
-  )
+    )
 
   CONFIGURE_FILE(
     ${CMAKE_SOURCE_DIR}/cmake/cpack-mac-bundle/dealii-terminal.in
     ${CMAKE_BINARY_DIR}/cpack/dealii-terminal
     @ONLY
-  )
+    )
 
   CONFIGURE_FILE(
     ${CMAKE_SOURCE_DIR}/cmake/cpack-mac-bundle/dealii.conf.in
     ${CMAKE_BINARY_DIR}/cpack/dealii.conf
     @ONLY
-  )
+    )
 
   CONFIGURE_FILE(
     ${CMAKE_SOURCE_DIR}/cmake/cpack-mac-bundle/Info.plist.in
     ${CMAKE_BINARY_DIR}/cpack/Info.plist
     @ONLY
-  )
+    )
 
-  SET(CPACK_PACKAGE_ICON 
+  SET(CPACK_PACKAGE_ICON
     "${CMAKE_SOURCE_DIR}/cmake/cpack-mac-bundle/dealii-icon.icns"
-  )
+    )
 
-  set(CPACK_PACKAGE_FILE_NAME 
+  set(CPACK_PACKAGE_FILE_NAME
     "${DEAL_II_PACKAGE_NAME}-${DEAL_II_PACKAGE_VERSION}"
-  )
+    )
 
-  set(CPACK_BUNDLE_NAME 
+  set(CPACK_BUNDLE_NAME
     "${DEAL_II_PACKAGE_NAME}"
-  )
+    )
 
-  SET(CPACK_BUNDLE_ICON 
+  SET(CPACK_BUNDLE_ICON
     "${CMAKE_SOURCE_DIR}/cmake/cpack-mac-bundle/dealii-icon.icns"
-  )
+    )
 
-  SET(CPACK_BUNDLE_PLIST 
+  SET(CPACK_BUNDLE_PLIST
     "${CMAKE_BINARY_DIR}/cpack/Info.plist"
-  )
+    )
 
-  SET(CPACK_BUNDLE_STARTUP_COMMAND 
+  SET(CPACK_BUNDLE_STARTUP_COMMAND
     "${CMAKE_BINARY_DIR}/cpack/mac_startup_script.sh"
-  )
+    )
 
-  INSTALL(FILES 
+  INSTALL(FILES
     ${CMAKE_BINARY_DIR}/cpack/dealii.conf
     DESTINATION ${DEAL_II_COMMON_RELDIR}
-  )
+    )
 
-  INSTALL(PROGRAMS 
-    ${CMAKE_BINARY_DIR}/cpack/dealii-terminal 
+  INSTALL(PROGRAMS
+    ${CMAKE_BINARY_DIR}/cpack/dealii-terminal
     DESTINATION ${DEAL_II_EXECUTABLE_RELDIR}
-  )
+    )
 
   IF(NOT "${DEAL_II_CPACK_EXTERNAL_LIBS_TREE}" STREQUAL "")
-     INSTALL(DIRECTORY ${DEAL_II_EXTERNAL_LIBS_TREE}/ 
-             DESTINATION opt
-             USE_SOURCE_PERMISSIONS)
+     INSTALL(DIRECTORY ${DEAL_II_EXTERNAL_LIBS_TREE}/
+       DESTINATION opt
+       USE_SOURCE_PERMISSIONS
+       )
   ENDIF()
 
   INCLUDE(CPack)