From b6842e8f383b882326c7295ecdad923b9dc2efc2 Mon Sep 17 00:00:00 2001 From: maier Date: Sat, 29 Sep 2012 00:03:32 +0000 Subject: [PATCH] A minor cosmetic change git-svn-id: https://svn.dealii.org/branches/branch_cmake@26876 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/cmake/setup_finalize.cmake | 16 ++++++++++++++++ deal.II/scripts/CMakeLists.txt | 17 +++++++---------- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/deal.II/cmake/setup_finalize.cmake b/deal.II/cmake/setup_finalize.cmake index c0ccb9fc6a..211de88aef 100644 --- a/deal.II/cmake/setup_finalize.cmake +++ b/deal.II/cmake/setup_finalize.cmake @@ -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: diff --git a/deal.II/scripts/CMakeLists.txt b/deal.II/scripts/CMakeLists.txt index 8db97c4161..ce780750d6 100644 --- a/deal.II/scripts/CMakeLists.txt +++ b/deal.II/scripts/CMakeLists.txt @@ -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 -- 2.39.5