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 de5f551dd701b4f9c554c163c13cf1358184d0b4..7f9c02deb9cb029ebb9aad4fa121dbfcb4e93f79 100644 (file)
--- 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 677e5174f4bb95bc261d78cabae28f56fa99291a..495f4eadc5a8705b2e61add4e4b6759d0c811ea3 100644 (file)
--- 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 d517590f5de03d749aee7d089ac6809e6a8ad0d2..4b3f6cdbb8b3836e2fbed06d714a2af83f240ea8 100644 (file)
--- 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()