]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
A minor cosmetic change
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Sat, 29 Sep 2012 00:03:32 +0000 (00:03 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Sat, 29 Sep 2012 00:03:32 +0000 (00:03 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26876 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/cmake/setup_finalize.cmake
deal.II/scripts/CMakeLists.txt

index c0ccb9fc6a497e87dee7c41dc8a59a52456c5ac3..211de88aef3046529f9a7968d501ab71fb0828f2 100644 (file)
@@ -25,6 +25,22 @@ FOREACH(flags ${deal_ii_used_flags})
 ENDFOREACH()
 
 
+#
+# Depulicate entries in DEAL_II_EXTERNAL_LIBRARIES(_...):
+#
+# Well, cmake has a bad habit of removing duplicate link library entries
+# from targets. It wouldn't be that harmful if cmake would do this from
+# behind... So, do it by hand to link correctly *sigh*
+#
+LIST(REVERSE DEAL_II_EXTERNAL_LIBRARIES)
+LIST(REMOVE_DUPLICATES DEAL_II_EXTERNAL_LIBRARIES)
+LIST(REVERSE DEAL_II_EXTERNAL_LIBRARIES)
+FOREACH(build ${DEAL_II_BUILD_TYPES})
+  LIST(REVERSE DEAL_II_EXTERNAL_LIBRARIES_${build})
+  LIST(REMOVE_DUPLICATES DEAL_II_EXTERNAL_LIBRARIES_${build})
+  LIST(REVERSE DEAL_II_EXTERNAL_LIBRARIES_${build})
+ENDFOREACH()
+
 
 #
 # And print out a nice configuration summary:
index 8db97c416109c97bd1de73c83634a5320545c3d6..ce780750d6b9fee4a3e1f41c2bd437954e0b8ed3 100644 (file)
@@ -9,20 +9,17 @@ IF(DEAL_II_COMPONENT_COMPAT_FILES)
   # executables:
   #
 
-  #INCLUDE_DIRECTORIES(
-  #  ${CMAKE_SOURCE_DIR}/include/
-  #  ${CMAKE_BINARY_DIR}/include/
-  #  )
+  INCLUDE_DIRECTORIES(
+    ${CMAKE_SOURCE_DIR}/include/
+    ${CMAKE_BINARY_DIR}/include/
+    )
 
   ADD_EXECUTABLE(make_dependencies make_dependencies.cc)
 
-  #ADD_EXECUTABLE(report_features report_features.cc)
-  #TARGET_LINK_LIBRARIES(report_features ${DEAL_II_EXTERNAL_LIBRARIES})
+  ADD_EXECUTABLE(report_features report_features.cc)
+  TARGET_LINK_LIBRARIES(report_features ${DEAL_II_EXTERNAL_LIBRARIES})
 
-  INSTALL(TARGETS
-    make_dependencies
-    #report_features
-    expand_instantiations
+  INSTALL(TARGETS make_dependencies report_features expand_instantiations
     RUNTIME
     DESTINATION common/scripts
     COMPONENT compat_files

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.