From: maier Date: Sun, 24 Mar 2013 22:41:12 +0000 (+0000) Subject: CMake: Remove unnecessary file globs X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43fc273db04250df6d854a5481a3bfe33e1dc8f6;p=dealii-svn.git CMake: Remove unnecessary file globs git-svn-id: https://svn.dealii.org/trunk@29018 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/doc/doxygen/CMakeLists.txt b/deal.II/doc/doxygen/CMakeLists.txt index a7000ed658..3b777bb71d 100644 --- a/deal.II/doc/doxygen/CMakeLists.txt +++ b/deal.II/doc/doxygen/CMakeLists.txt @@ -47,13 +47,11 @@ CONFIGURE_FILE( # Finalize the doxygen configuration: # file(GLOB doxygen_input - ${CMAKE_CURRENT_SOURCE_DIR}/headers/*.h - ${CMAKE_SOURCE_DIR}/contrib/parameter_gui/*.h - ${CMAKE_SOURCE_DIR}/contrib/parameter_gui/main.cpp - ${CMAKE_SOURCE_DIR}/doc/news/*.h - ${CMAKE_SOURCE_DIR}/include/deal.II/**/*.h - - ${CMAKE_BINARY_DIR}/include/deal.II/base/config.h + ${CMAKE_CURRENT_SOURCE_DIR}/headers + ${CMAKE_SOURCE_DIR}/contrib/parameter_gui + ${CMAKE_SOURCE_DIR}/doc/news + ${CMAKE_SOURCE_DIR}/include/deal.II/*/ + ${CMAKE_BINARY_DIR}/include/deal.II/*/ ${CMAKE_CURRENT_BINARY_DIR}/tutorial ) TO_STRING(doxygen_input_string ${doxygen_input}) @@ -62,7 +60,6 @@ file(GLOB doxygen_image_path ${CMAKE_CURRENT_SOURCE_DIR}/images ${CMAKE_SOURCE_DIR}/examples/*/doc ${CMAKE_SOURCE_DIR}/contrib/parameter_gui/images - ${CMAKE_CURRENT_BINARY_DIR}/images ) TO_STRING(doxygen_image_path_string ${doxygen_image_path}) diff --git a/deal.II/examples/CMakeLists.txt b/deal.II/examples/CMakeLists.txt index 00c5543911..e7cef1090d 100644 --- a/deal.II/examples/CMakeLists.txt +++ b/deal.II/examples/CMakeLists.txt @@ -13,20 +13,13 @@ ##### IF(DEAL_II_COMPONENT_EXAMPLES) - # - # Add a rule on how to install the examples: - # - - file(GLOB _steps ${CMAKE_CURRENT_SOURCE_DIR}/step-*) - - FOREACH(_step ${_steps}) - INSTALL(DIRECTORY ${_step} - DESTINATION ${DEAL_II_EXAMPLES_RELDIR} - COMPONENT examples - PATTERN ".svn" EXCLUDE - PATTERN "doc" EXCLUDE - PATTERN "TODO" EXCLUDE - ) - ENDFOREACH() - + INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ + DESTINATION ${DEAL_II_EXAMPLES_RELDIR} + COMPONENT examples + PATTERN "${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt" EXCLUDE + PATTERN "doc" EXCLUDE + PATTERN "doxygen" EXCLUDE + PATTERN ".svn" EXCLUDE + PATTERN "TODO" EXCLUDE + ) ENDIF()