From: maier Date: Fri, 21 Sep 2012 18:29:07 +0000 (+0000) Subject: Bugfixes X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec5ae5a22ab7fe969b717fefe4381065ad2e884c;p=dealii-svn.git Bugfixes git-svn-id: https://svn.dealii.org/branches/branch_cmake@26603 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/cmake/macros/macro_to_string.cmake b/deal.II/cmake/macros/macro_to_string.cmake index 2bdd4de45c..7bdb48c68c 100644 --- a/deal.II/cmake/macros/macro_to_string.cmake +++ b/deal.II/cmake/macros/macro_to_string.cmake @@ -1,15 +1,15 @@ # -# A small macro used for converting a cmake list into a space -# separated : +# A small macro used for converting a list into a space +# separated string: # # Usage: -# TO_STRING(string list) +# TO_STRING(string ${list1} ${list2} ...) # -MACRO(TO_STRING variable list) +MACRO(TO_STRING variable) SET(${variable} "") - FOREACH(var ${${list}}) + FOREACH(var ${ARGN}) SET(${variable} "${${variable}} ${var}") ENDFOREACH() STRING(STRIP "${${variable}}" ${variable}) diff --git a/deal.II/cmake/macros/macro_to_string_and_add_prefix.cmake b/deal.II/cmake/macros/macro_to_string_and_add_prefix.cmake index c4c6ee9616..7df7da7bbd 100644 --- a/deal.II/cmake/macros/macro_to_string_and_add_prefix.cmake +++ b/deal.II/cmake/macros/macro_to_string_and_add_prefix.cmake @@ -1,16 +1,16 @@ # -# A small macro used for converting a cmake list into a space -# separated . This macro adds the string in front of each -# element of the list . +# A small macro used for converting a cmake list into a space +# separated string. This macro adds the string "prefix" in front of each +# element of the list. # # Usage: -# TO_STRING_AND_ADD_PREFIX(string list) +# TO_STRING_AND_ADD_PREFIX(string "prefix" ${list1} ${list2} ...) # -MACRO(TO_STRING_AND_ADD_PREFIX variable prefix list) +MACRO(TO_STRING_AND_ADD_PREFIX variable prefix) SET(${variable} "") - FOREACH(var ${${list}}) + FOREACH(var ${ARGN}) SET(${variable} "${${variable}} ${prefix}${var}") ENDFOREACH() STRING(STRIP "${${variable}}" ${variable}) diff --git a/deal.II/config/CMakeLists.txt b/deal.II/config/CMakeLists.txt index 20079211e0..facfe9181a 100644 --- a/deal.II/config/CMakeLists.txt +++ b/deal.II/config/CMakeLists.txt @@ -14,6 +14,15 @@ IF(DEAL_II_INSTALL_PROJECT_CONFIG) ${CMAKE_CURRENT_BINARY_DIR}/deal.IIConfig.cmake ) + GET_CMAKE_PROPERTY(res VARIABLES) + FOREACH(var ${res}) + IF(var MATCHES "DEAL_II_WITH") + FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/deal.IIConfig.cmake + "SET(${var} ${${var}})\n" + ) + ENDIF() + ENDFOREACH() + CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/deal.IIConfigVersion.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/deal.IIConfigVersion.cmake @@ -39,15 +48,19 @@ IF(DEAL_II_INSTALL_COMPAT_FILES) # actually understands: # - TO_STRING(MAKEFILE_EXTERNAL_LIBRARIES DEAL_II_EXTERNAL_LIBRARIES) - TO_STRING(MAKEFILE_LIBRARIES DEAL_II_LIBRARIES) - ADD_FLAGS(MAKEFILE_EXTERNAL_LIBRARIES "${MAKEFILE_LIBRARIES}") + TO_STRING(MAKEFILE_LIBRARIES + ${DEAL_II_EXTERNAL_LIBRARIES} + ${DEAL_II_LIBRARIES} + ) - TO_STRING(MAKEFILE_EXTERNAL_DEFINITIONS DEAL_II_EXTERNAL_DEFINITIONS) + TO_STRING(MAKEFILE_DEFINITIONS + ${DEAL_II_EXTERNAL_DEFINITIONS} + ) - TO_STRING_AND_ADD_PREFIX(MAKEFILE_EXTERNAL_INCLUDES + TO_STRING_AND_ADD_PREFIX(MAKEFILE_INCLUDE_DIRS "${CMAKE_INCLUDE_FLAG_C}" - DEAL_II_EXTERNAL_INCLUDE_DIRS + ${DEAL_II_EXTERNAL_INCLUDE_DIRS} + ${DEAL_II_INCLUDE_DIRS} ) CONFIGURE_FILE( diff --git a/deal.II/config/Make.global_options.in b/deal.II/config/Make.global_options.in index 7eec0c7d22..c03acbac8e 100644 --- a/deal.II/config/Make.global_options.in +++ b/deal.II/config/Make.global_options.in @@ -66,28 +66,28 @@ endif vpath %@static_lib_suffix@ $(LIBDIR) vpath %@shared_lib_suffix@ $(LIBDIR) -OBJEXT = @CMAKE_CXX_OUTPUT_EXTENSION@ +OBJEXT = o # TODO: @CMAKE_CXX_OUTPUT_EXTENSION@ :-* EXEEXT = @EXEEXT@ # TODO # set paths to all the libraries we need: -lib-deal2.o = ${MAKEFILE_EXTERNAL_LIBRARIES} -lib-deal2.g = ${MAKEFILE_EXTERNAL_LIBRARIES} +lib-deal2.o = ${MAKEFILE_LIBRARIES} +lib-deal2.g = ${MAKEFILE_LIBRARIES} # necessary includes: -INCLUDE = ${MAKEFILE_EXTERNAL_INCLUDES} +INCLUDE = ${MAKEFILE_INCLUDE_DIRS} # compiler flags for debug and optimized mode -CXXFLAGS.g = @CMAKE_CXX_FLAGS@ @CMAKE_CXX_FLAGS_DEBUG@ @MAKEFILE_EXTERNAL_DEFINITIONS@ $(INCLUDE) -CXXFLAGS.o = @CMAKE_CXX_FLAGS@ @CMAKE_CXX_FLAGS_RELEASE@ @MAKEFILE_EXTERNAL_DEFINITIONS@ $(INCLUDE) +CXXFLAGS.g = @CMAKE_CXX_FLAGS@ @CMAKE_CXX_FLAGS_DEBUG@ @MAKEFILE_DEFINITIONS@ $(INCLUDE) +CXXFLAGS.o = @CMAKE_CXX_FLAGS@ @CMAKE_CXX_FLAGS_RELEASE@ @MAKEFILE_DEFINITIONS@ $(INCLUDE) # compile flags for C compiler -CFLAGS.g = @CMAKE_C_FLAGS@ @CMAKE_C_FLAGS_DEBUG@ @MAKEFILE_EXTERNAL_DEFINITIONS@ -CFLAGS.o = @CMAKE_C_FLAGS@ @CMAKE_C_FLAGS_RELEASE@ @MAKEFILE_EXTERNAL_DEFINITIONS@ +CFLAGS.g = @CMAKE_C_FLAGS@ @CMAKE_C_FLAGS_DEBUG@ @MAKEFILE_DEFINITIONS@ +CFLAGS.o = @CMAKE_C_FLAGS@ @CMAKE_C_FLAGS_RELEASE@ @MAKEFILE_DEFINITIONS@ ifneq ($(enable-threads),no) diff --git a/deal.II/config/deal.IIConfig.cmake.in b/deal.II/config/deal.IIConfig.cmake.in index af86f87948..08f6ce7719 100644 --- a/deal.II/config/deal.IIConfig.cmake.in +++ b/deal.II/config/deal.IIConfig.cmake.in @@ -69,3 +69,7 @@ SET(DEAL_II_EXTERNAL_LIBRARIES "${DEAL_II_EXTERNAL_LIBRARIES}") SET(DEAL_II_EXTERNAL_DEFINITIONS "${DEAL_II_EXTERNAL_DEFINITIONS}") +# +# Feature configuration of the deal.II library +# + diff --git a/deal.II/config/deal.IIConfigVersion.cmake.in b/deal.II/config/deal.IIConfigVersion.cmake.in index 2acf5956fa..5fe138968c 100644 --- a/deal.II/config/deal.IIConfigVersion.cmake.in +++ b/deal.II/config/deal.IIConfigVersion.cmake.in @@ -1,6 +1,6 @@ # -# A suggested by the cmake documentation +# As suggested by the cmake documentation # set(PACKAGE_VERSION "@DEAL_II_MAJOR@.@DEAL_II_MINOR@")