From: maier Date: Fri, 5 Oct 2012 16:01:47 +0000 (+0000) Subject: Remove superfluous macro X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ad1d37c5c785cb20193f7ecbe717980968166d0;p=dealii-svn.git Remove superfluous macro git-svn-id: https://svn.dealii.org/branches/branch_cmake@26968 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/cmake/macros/macro_deal_ii_import_library_targets.cmake b/deal.II/cmake/macros/macro_deal_ii_import_library_targets.cmake deleted file mode 100644 index 57ae09782d..0000000000 --- a/deal.II/cmake/macros/macro_deal_ii_import_library_targets.cmake +++ /dev/null @@ -1,45 +0,0 @@ -##### -## -## Copyright (C) 2012 by the deal.II authors -## -## This file is part of the deal.II library. -## -## -## This file is dual licensed under QPL 1.0 and LGPL 2.1 or any later -## version of the LGPL license. -## -## Author: Matthias Maier -## -##### - -# -# This file implements the DEAL_II_IMPORT_LIBRARY macro, which is -# part of the deal.II library. -# -# Usage: -# DEAL_II_IMPORT_LIBRARY() -# -# This sets some cached variables to the values used for compiling the -# deal.II library. -# -# This macro has to be called before PROJECT()! -# - -MACRO(DEAL_II_IMPORT_LIBRARY) - - IF(NOT DEAL_II_PROJECT_CONFIG_INCLUDED) - MESSAGE(FATAL_ERROR - "\nDEAL_II_SETUP_TARGET can only be called in external projects after " - "the inclusion of deal.IIConfig.cmake. It is not intended for " - "internal use.\n\n" - ) - ENDIF() - - INCLUDE(${DEAL_II_TARGET_CONFIG}) - - # - # Setup a ${DEAL_II_BASE_NAME} target and populate it with our - # - -ENDMACRO() - diff --git a/deal.II/cmake/macros/macro_deal_ii_setup_target.cmake b/deal.II/cmake/macros/macro_deal_ii_setup_target.cmake index d2249371c1..ad39e5bc3d 100644 --- a/deal.II/cmake/macros/macro_deal_ii_setup_target.cmake +++ b/deal.II/cmake/macros/macro_deal_ii_setup_target.cmake @@ -34,6 +34,11 @@ MACRO(DEAL_II_SETUP_TARGET target) ) ENDIF() + IF(NOT DEAL_II_TARGET_CONFIG_INCLUDED) + INCLUDE(${DEAL_II_TARGET_CONFIG}) + SET(DEAL_II_PROJECT_CONFIG_INCLUDED TRUE) + ENDIF() + # Necessary for setting INCLUDE_DIRECTORIES via SET_TARGET_PROPERTIES CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8) diff --git a/deal.II/config/CMakeLists.txt b/deal.II/config/CMakeLists.txt index f77b192c54..5382bbd59a 100644 --- a/deal.II/config/CMakeLists.txt +++ b/deal.II/config/CMakeLists.txt @@ -26,13 +26,11 @@ CONFIGURE_FILE( ########################################################################### LIST(APPEND DEAL_II_MACROS - ${CMAKE_INSTALL_PREFIX}/${DEAL_II_CMAKE_MACROS_RELDIR}/macro_deal_ii_import_library_targets.cmake ${CMAKE_INSTALL_PREFIX}/${DEAL_II_CMAKE_MACROS_RELDIR}/macro_deal_ii_initialize_cached_variables.cmake ${CMAKE_INSTALL_PREFIX}/${DEAL_II_CMAKE_MACROS_RELDIR}/macro_deal_ii_setup_target.cmake ) INSTALL(FILES - ${CMAKE_SOURCE_DIR}/cmake/macros/macro_deal_ii_import_library_targets.cmake ${CMAKE_SOURCE_DIR}/cmake/macros/macro_deal_ii_initialize_cached_variables.cmake ${CMAKE_SOURCE_DIR}/cmake/macros/macro_deal_ii_setup_target.cmake DESTINATION ${DEAL_II_CMAKE_MACROS_RELDIR}