From: bangerth Date: Fri, 19 Apr 2013 00:49:35 +0000 (+0000) Subject: Revert r29332 since it leads to bad entries in common/Make.global_options. See bug... X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0e93ea24efbe90bcdf94a8d77f62400ac15af3b;p=dealii-svn.git Revert r29332 since it leads to bad entries in common/Make.global_options. See bug #37 on the google code tracker site. git-svn-id: https://svn.dealii.org/trunk@29340 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/cmake/config/CMakeLists.txt b/deal.II/cmake/config/CMakeLists.txt index 212fc29f0a..02780e6ed2 100644 --- a/deal.II/cmake/config/CMakeLists.txt +++ b/deal.II/cmake/config/CMakeLists.txt @@ -189,23 +189,13 @@ IF(DEAL_II_COMPONENT_COMPAT_FILES) ${DEAL_II_EXTERNAL_LIBRARIES} ${DEAL_II_EXTERNAL_LIBRARIES_${build}} ) + LIST(APPEND MAKEFILE_LIBS_${build} ${_lib}) + # + # Extract library paths where possible: + # IF(_lib MATCHES "^(/|\\$\\(D\\))") - - # Extract library paths where possible: GET_FILENAME_COMPONENT(_path ${_lib} PATH) LIST(APPEND _paths ${_path}) - - # Append the library with full path to the link line: - LIST(APPEND MAKEFILE_LIBS_${build} ${_lib}) - ELSE() - - # Not a full path, append a "-l" if not already present: - IF(_lib MATCHES "^-l") - LIST(APPEND MAKEFILE_LIBS_${build} ${_lib}) - ELSE() - LIST(APPEND MAKEFILE_LIBS_${build} "-l${_lib}") - ENDIF() - ENDIF() ENDFOREACH()