From 25d42b821c9a540addee7e41253381f46593639b Mon Sep 17 00:00:00 2001 From: maier Date: Mon, 11 Mar 2013 23:33:09 +0000 Subject: [PATCH] CMake: Bugfix, set lib-deal2 and libdeal2.g variables in Make.global_options correctly git-svn-id: https://svn.dealii.org/trunk@28860 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/cmake/config/CMakeLists.txt | 15 +++++++++++---- deal.II/cmake/config/Make.global_options.in | 4 ++-- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/deal.II/cmake/config/CMakeLists.txt b/deal.II/cmake/config/CMakeLists.txt index b427bd153b..4b771f2a12 100644 --- a/deal.II/cmake/config/CMakeLists.txt +++ b/deal.II/cmake/config/CMakeLists.txt @@ -139,10 +139,6 @@ IF(DEAL_II_COMPONENT_COMPAT_FILES) # # Transform some cmake lists into a string that the old Makefile # mechanism actually understands: - # - # TODO: Come up with an idea how to get the link line directly from - # CMake... - # TO_STRING_AND_ADD_PREFIX(MAKEFILE_INCLUDE_DIRS "${CMAKE_INCLUDE_FLAG_CXX}" ${DEAL_II_USER_INCLUDE_DIRS} @@ -156,6 +152,16 @@ IF(DEAL_II_COMPONENT_COMPAT_FILES) ${DEAL_II_USER_DEFINITIONS_${build}} ) + TO_STRING(MAKEFILE_TARGETS_${build} + ${MAKEFILE_LIBRARY_${build}} + ${DEAL_II_EXTERNAL_LIBRARIES} + ${DEAL_II_EXTERNAL_LIBRARIES_${build}} + ) + + # + # TODO: Come up with an idea how to get the link line directly from + # CMake... + # FOREACH(_lib ${MAKEFILE_LIBRARY_${build}} ${DEAL_II_EXTERNAL_LIBRARIES} @@ -212,3 +218,4 @@ IF(DEAL_II_COMPONENT_COMPAT_FILES) COMPONENT compat_files ) ENDIF() + diff --git a/deal.II/cmake/config/Make.global_options.in b/deal.II/cmake/config/Make.global_options.in index 3445c489e1..0b51d139b2 100644 --- a/deal.II/cmake/config/Make.global_options.in +++ b/deal.II/cmake/config/Make.global_options.in @@ -60,8 +60,8 @@ EXEEXT = # set paths to all the libraries we need: -lib-deal2.o = ${DEAL_II_LIBRARIES_RELEASE} -lib-deal2.g = ${DEAL_II_LIBRARIES_DEBUG} +lib-deal2.o = ${MAKEFILE_TARGETS_RELEASE} +lib-deal2.g = ${MAKEFILE_TARGETS_DEBUG} # include paths as command line flags. while compilers allow a space between -- 2.39.5