From: Matthias Maier Date: Sat, 5 Mar 2016 09:02:56 +0000 (-0600) Subject: CMake: remove legacy Make.global_options X-Git-Tag: v8.5.0-rc1~1204^2~2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=359e60b351cc7b784cb1abe20f5c5cbf36a35340;p=dealii.git CMake: remove legacy Make.global_options --- diff --git a/cmake/config/CMakeLists.txt b/cmake/config/CMakeLists.txt index e27a9db4d0..578d1f8e6c 100644 --- a/cmake/config/CMakeLists.txt +++ b/cmake/config/CMakeLists.txt @@ -18,7 +18,6 @@ # # deal.IIConfig.cmake # deal.IIVersionConfig.cmake -# Make.global_options # # We support two configurations out of which deal.II can be used - directly # from the build directory or after installation. So we have to prepare @@ -109,29 +108,17 @@ FOREACH(_build ${DEAL_II_BUILD_TYPES}) ${DEAL_II_LIBRARIES_${_build}} ${DEAL_II_LIBRARIES} ) - TO_STRING(MAKEFILE_LIBRARIES_${_build} ${CONFIG_LIBRARIES_${_build}}) - TO_STRING(MAKEFILE_USER_DEFINITIONS_${_build} ${DEAL_II_USER_DEFINITIONS_${_build}}) LIST(APPEND CONFIG_LIBRARIES ${_keyword} \${DEAL_II_LIBRARIES_${_build}}) SET(CONFIG_TARGET_${_build} ${DEAL_II_BASE_NAME}${DEAL_II_${_build}_SUFFIX}) LIST(APPEND CONFIG_TARGET ${_keyword} \${DEAL_II_TARGET_${_build}}) ENDFOREACH() -TO_STRING(MAKEFILE_BUILD_TYPES ${DEAL_II_BUILD_TYPES}) -TO_STRING(MAKEFILE_USER_DEFINITIONS ${DEAL_II_USER_DEFINITIONS}) - -IF(DEAL_II_STATIC_EXECUTABLE) - SET(MAKEFILE_STATIC_EXECUTABLE "true") -ELSE() - SET(MAKEFILE_STATIC_EXECUTABLE "false") -ENDIF() - # # For binary dir: # SET(CONFIG_BUILD_DIR TRUE) -SET(MAKEFILE_BUILD_DIR "true") SET(CONFIG_INCLUDE_DIRS \${DEAL_II_PATH}/include ${CMAKE_SOURCE_DIR}/include/ @@ -148,19 +135,12 @@ CONFIGURE_FILE( ${CMAKE_BINARY_DIR}/${DEAL_II_PROJECT_CONFIG_RELDIR}/${DEAL_II_PROJECT_CONFIG_NAME}ConfigVersion.cmake @ONLY ) -TO_STRING(MAKEFILE_INCLUDE_DIRS ${CONFIG_INCLUDE_DIRS}) -CONFIGURE_FILE( - ${CMAKE_CURRENT_SOURCE_DIR}/Make.global_options.in - ${CMAKE_BINARY_DIR}/${DEAL_II_SHARE_RELDIR}/Make.global_options - @ONLY - ) # # For installation: # SET(CONFIG_BUILD_DIR FALSE) -SET(MAKEFILE_BUILD_DIR "false") SET(CONFIG_INCLUDE_DIRS \${DEAL_II_PATH}/\${DEAL_II_INCLUDE_RELDIR} \${DEAL_II_PATH}/\${DEAL_II_INCLUDE_RELDIR}/deal.II/bundled @@ -176,23 +156,12 @@ CONFIGURE_FILE( ${CMAKE_CURRENT_BINARY_DIR}/${DEAL_II_PROJECT_CONFIG_NAME}ConfigVersion.cmake @ONLY ) -TO_STRING(MAKEFILE_INCLUDE_DIRS ${CONFIG_INCLUDE_DIRS}) -CONFIGURE_FILE( - ${CMAKE_CURRENT_SOURCE_DIR}/Make.global_options.in - ${CMAKE_CURRENT_BINARY_DIR}/Make.global_options - @ONLY - ) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DEAL_II_PROJECT_CONFIG_NAME}Config.cmake ${CMAKE_CURRENT_BINARY_DIR}/${DEAL_II_PROJECT_CONFIG_NAME}ConfigVersion.cmake DESTINATION ${DEAL_II_PROJECT_CONFIG_RELDIR} COMPONENT library ) -INSTALL(FILES - ${CMAKE_CURRENT_BINARY_DIR}/Make.global_options - DESTINATION ${DEAL_II_SHARE_RELDIR} - COMPONENT library - ) # # Append feature configuration to all configuration files: @@ -229,19 +198,6 @@ FOREACH(var ${res}) ) ENDIF() ENDFOREACH() - - FOREACH(_file ${_makefiles}) - IF(${var}) - FILE(APPEND ${_file} "${var} = true\n") - IF(NOT "${${_name}_VERSION}" STREQUAL "") - FILE(APPEND ${_file} - "DEAL_II_${_name}_VERSION = ${${_name}_VERSION}\n" - ) - ENDIF() - ELSE() - FILE(APPEND ${_file} "${var} = false\n") - ENDIF() - ENDFOREACH() ENDIF() ENDFOREACH() diff --git a/cmake/config/Make.global_options.in b/cmake/config/Make.global_options.in deleted file mode 100644 index e27daf7a1f..0000000000 --- a/cmake/config/Make.global_options.in +++ /dev/null @@ -1,136 +0,0 @@ -## --------------------------------------------------------------------- -## -## Copyright (C) 2014 - 2015 by the deal.II authors -## -## This file is part of the deal.II library. -## -## The deal.II library is free software; you can use it, redistribute -## it, and/or modify it under the terms of the GNU Lesser General -## Public License as published by the Free Software Foundation; either -## version 2.1 of the License, or (at your option) any later version. -## The full text of the license can be found in the file LICENSE at -## the top level of the deal.II distribution. -## -## --------------------------------------------------------------------- - - -######################################################################## -## ## -## The deal.II project configuration file ## -## ## -######################################################################## - - -# -# General information -# - -DEAL_II_PACKAGE_NAME = @DEAL_II_PACKAGE_NAME@ -DEAL_II_PACKAGE_VERSION = @DEAL_II_PACKAGE_VERSION@ -DEAL_II_PACKAGE_VENDOR = @DEAL_II_PACKAGE_VENDOR@ -DEAL_II_PACKAGE_DESCRIPTION = @DEAL_II_PACKAGE_DESCRIPTION@ - -DEAL_II_VERSION_MAJOR = @DEAL_II_VERSION_MAJOR@ -DEAL_II_VERSION_MINOR = @DEAL_II_VERSION_MINOR@ -DEAL_II_VERSION_SUBMINOR = @DEAL_II_VERSION_SUBMINOR@ -DEAL_II_VERSION = @DEAL_II_VERSION@ - -DEAL_II_GIT_BRANCH = @DEAL_II_GIT_BRANCH@ -DEAL_II_GIT_REVISION = @DEAL_II_GIT_REVISION@ -DEAL_II_GIT_SHORTREV = @DEAL_II_GIT_SHORTREV@ - -DEAL_II_PROJECT_CONFIG_NAME = @DEAL_II_PROJECT_CONFIG_NAME@ - -DEAL_II_BUILD_TYPE = @CMAKE_BUILD_TYPE@ -DEAL_II_BUILD_TYPES = @MAKEFILE_BUILD_TYPES@ - -# -# Information about the project location -# - -DEAL_II_SHARE_RELDIR = @DEAL_II_SHARE_RELDIR@ -DEAL_II_DOCREADME_RELDIR = @DEAL_II_DOCREADME_RELDIR@ -DEAL_II_DOCHTML_RELDIR = @DEAL_II_DOCHTML_RELDIR@ -DEAL_II_EXAMPLES_RELDIR = @DEAL_II_EXAMPLES_RELDIR@ -DEAL_II_EXECUTABLE_RELDIR = @DEAL_II_EXECUTABLE_RELDIR@ -DEAL_II_INCLUDE_RELDIR = @DEAL_II_INCLUDE_RELDIR@ -DEAL_II_LIBRARY_RELDIR = @DEAL_II_LIBRARY_RELDIR@ -DEAL_II_PROJECT_CONFIG_RELDIR = @DEAL_II_PROJECT_CONFIG_RELDIR@ - -# -# Determine DEAL_II_PATH from MAKEFILE_LIST: -# -DEAL_II_MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST))) -DEAL_II_PATH := $(subst /${DEAL_II_SHARE_RELDIR}/Make.global_options,,${DEAL_II_MAKEFILE_PATH}) - -# -# Information about configuration: -# - -DEAL_II_PROJECT_CONFIG_INCLUDED = true -DEAL_II_BUILD_DIR = @MAKEFILE_BUILD_DIR@ - - -# -# Compiler and linker configuration -# - -DEAL_II_CXX_COMPILER = @CMAKE_CXX_COMPILER@ - -# used for all targets: -DEAL_II_CXX_FLAGS = @DEAL_II_CXX_FLAGS@ - -# _additionally_ used for debug targets: -DEAL_II_CXX_FLAGS_DEBUG = @DEAL_II_CXX_FLAGS_DEBUG@ - -# _additionally_ used for release targets: -DEAL_II_CXX_FLAGS_RELEASE = @DEAL_II_CXX_FLAGS_RELEASE@ - -# used for all targets: -DEAL_II_LINKER_FLAGS = @DEAL_II_LINKER_FLAGS@ - -# _additionally_ used for debug targets: -DEAL_II_LINKER_FLAGS_DEBUG = @DEAL_II_LINKER_FLAGS_DEBUG@ - -# _additionally_ used for release targets: -DEAL_II_LINKER_FLAGS_RELEASE = @DEAL_II_LINKER_FLAGS_RELEASE@ - -# used for all targets: -DEAL_II_USER_DEFINITIONS = @MAKEFILE_USER_DEFINITIONS@ - -# _additionally_ used for debug targets: -DEAL_II_USER_DEFINITIONS_DEBUG = @MAKEFILE_USER_DEFINITIONS_DEBUG@ - -# _additionally_ used for release targets: -DEAL_II_USER_DEFINITIONS_RELEASE = @MAKEFILE_USER_DEFINITIONS_RELEASE@ - - -# -# MPI runtime: -# - -DEAL_II_MPIEXEC = @MPIEXEC@ -DEAL_II_MPIEXEC_NUMPROC_FLAG = @MPIEXEC_NUMPROC_FLAG@ -DEAL_II_MPIEXEC_PREFLAGS = @MPIEXEC_PREFLAGS@ -DEAL_II_MPIEXEC_POSTFLAGS = @MPIEXEC_POSTFLAGS@ - - -# -# Build a static executable: -# - -DEAL_II_STATIC_EXECUTABLE = @MAKEFILE_STATIC_EXECUTABLE@ - - -# -# Information about include directories and libraries -# - -# Full list of include directories: -DEAL_II_INCLUDE_DIRS = ${DEAL_II_PATH}@MAKEFILE_INCLUDE_DIRS@ - -# Full list of libraries for the debug target: -DEAL_II_LIBRARIES_DEBUG = ${DEAL_II_PATH}@MAKEFILE_LIBRARIES_DEBUG@ - -# Full list of libraries for the release target: -DEAL_II_LIBRARIES_RELEASE = ${DEAL_II_PATH}@MAKEFILE_LIBRARIES_RELEASE@