From: Matthias Maier <tamiko@kyomu.43-1.org>
Date: Sat, 13 Jul 2013 09:14:50 +0000 (+0000)
Subject: CMake: Cleanup
X-Git-Tag: v8.0.0~133
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff8ab5163a23f246f4ae02ae7f319b58b951c046;p=dealii.git

CMake: Cleanup

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

diff --git a/deal.II/cmake/setup_compiler_flags_gnu.cmake b/deal.II/cmake/setup_compiler_flags_gnu.cmake
index de5f551dd7..7f9c02deb9 100644
--- a/deal.II/cmake/setup_compiler_flags_gnu.cmake
+++ b/deal.II/cmake/setup_compiler_flags_gnu.cmake
@@ -100,8 +100,6 @@ IF(DEAL_II_STATIC_EXECUTABLE)
   # To produce a static executable, we have to statically link libstdc++
   # and gcc's support libraries and glibc:
   #
-  # (Well... the name "DEAL_II_LINKER_FLAGS" is a bit misleading :-])
-  #
   ENABLE_IF_SUPPORTED(DEAL_II_LINKER_FLAGS "-static")
   ENABLE_IF_SUPPORTED(DEAL_II_LINKER_FLAGS "-pthread")
 ENDIF()
diff --git a/deal.II/cmake/setup_compiler_flags_intel.cmake b/deal.II/cmake/setup_compiler_flags_intel.cmake
index 677e5174f4..495f4eadc5 100644
--- a/deal.II/cmake/setup_compiler_flags_intel.cmake
+++ b/deal.II/cmake/setup_compiler_flags_intel.cmake
@@ -80,6 +80,18 @@ ENABLE_IF_SUPPORTED(CMAKE_CXX_FLAGS "-wd1478")
 ENABLE_IF_SUPPORTED(CMAKE_CXX_FLAGS "-wd1572")
 
 
+IF(DEAL_II_STATIC_EXECUTABLE)
+  #
+  # To produce a static executable, we have to statically link intel's
+  # support libraries:
+  #
+  ENABLE_IF_SUPPORTED(DEAL_II_LINKER_FLAGS "-static")
+  ENABLE_IF_SUPPORTED(DEAL_II_LINKER_FLAGS "-static-intel")
+  ENABLE_IF_SUPPORTED(DEAL_II_LINKER_FLAGS "-static-gcc")
+  ENABLE_IF_SUPPORTED(DEAL_II_LINKER_FLAGS "-pthread")
+ENDIF()
+
+
 #############################
 #                           #
 #    For Release target:    #
diff --git a/deal.II/cmake/setup_deal_ii.cmake b/deal.II/cmake/setup_deal_ii.cmake
index d517590f5d..4b3f6cdbb8 100644
--- a/deal.II/cmake/setup_deal_ii.cmake
+++ b/deal.II/cmake/setup_deal_ii.cmake
@@ -188,5 +188,5 @@ IF(CMAKE_CROSSCOMPILING)
   SET(DEAL_II_NATIVE "DEAL_II_NATIVE-NOTFOUND" CACHE FILEPATH
     "A pointer to a native deal.Ii build directory"
     )
-  INCLUDE(${DEAL_II_NATIVE}/cmake/scripts//importExecutables.cmake)
+  INCLUDE(${DEAL_II_NATIVE}/cmake/scripts/importExecutables.cmake)
 ENDIF()