From 5a010409c0c3f27d5c55f1686cae91cc208aa6a4 Mon Sep 17 00:00:00 2001 From: maier Date: Wed, 24 Oct 2012 17:35:14 +0000 Subject: [PATCH] Code Cleanup git-svn-id: https://svn.dealii.org/branches/branch_cmake@27199 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/bundled/CMakeLists.txt | 1 - deal.II/config/CMakeLists.txt | 2 +- deal.II/include/CMakeLists.txt | 3 --- deal.II/scripts/CMakeLists.txt | 1 - 4 files changed, 1 insertion(+), 6 deletions(-) diff --git a/deal.II/bundled/CMakeLists.txt b/deal.II/bundled/CMakeLists.txt index d26d038f59..657790f618 100644 --- a/deal.II/bundled/CMakeLists.txt +++ b/deal.II/bundled/CMakeLists.txt @@ -91,7 +91,6 @@ ENDIF() # # UMFPACK, AMD and UFCONFIG: # - SET(FEATURE_UMFPACK_HAVE_BUNDLED TRUE) SET(UMFPACK_FOLDER "${CMAKE_SOURCE_DIR}/bundled/umfpack") OPTION(DEAL_II_FORCE_BUNDLED_UMFPACK diff --git a/deal.II/config/CMakeLists.txt b/deal.II/config/CMakeLists.txt index b29ce4d26c..c42c2c67e8 100644 --- a/deal.II/config/CMakeLists.txt +++ b/deal.II/config/CMakeLists.txt @@ -56,8 +56,8 @@ FOREACH(build ${DEAL_II_BUILD_TYPES}) ENDFOREACH() SET(CONFIG_INCLUDE_DIRS - ${DEAL_II_USER_INCLUDE_DIRS} ${DEAL_II_INCLUDE_DIRS} + ${DEAL_II_USER_INCLUDE_DIRS} ) CONFIGURE_FILE( diff --git a/deal.II/include/CMakeLists.txt b/deal.II/include/CMakeLists.txt index a68acbfc08..4d03268c71 100644 --- a/deal.II/include/CMakeLists.txt +++ b/deal.II/include/CMakeLists.txt @@ -20,11 +20,9 @@ CONFIGURE_FILE( ${CMAKE_CURRENT_BINARY_DIR}/deal.II/base/config.h ) - # # Add a rule on how to install the header files: # - INSTALL(DIRECTORY deal.II DESTINATION ${DEAL_II_INCLUDE_RELDIR} COMPONENT library @@ -32,7 +30,6 @@ INSTALL(DIRECTORY deal.II PATTERN ".svn" EXCLUDE ) - # # and don't forget to install all generated header files, too: # diff --git a/deal.II/scripts/CMakeLists.txt b/deal.II/scripts/CMakeLists.txt index 4a265d045a..0a8af654fb 100644 --- a/deal.II/scripts/CMakeLists.txt +++ b/deal.II/scripts/CMakeLists.txt @@ -14,7 +14,6 @@ ADD_EXECUTABLE(expand_instantiations expand_instantiations.cc) - IF(DEAL_II_COMPONENT_COMPAT_FILES) # # Build and install the old dependency_resolution and report_features -- 2.39.5