From 2b03a8dcb1022d01ed7a793c04e6f1ca854f2f87 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Sat, 2 Nov 2013 12:11:19 +0000 Subject: [PATCH] Bugfix: Use DEAL_II_EXECUTABLE_RELDIR for Windows targets git-svn-id: https://svn.dealii.org/trunk@31511 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/cmake/config/CMakeLists.txt | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/deal.II/cmake/config/CMakeLists.txt b/deal.II/cmake/config/CMakeLists.txt index eea6fdf8f0..ed805981f8 100644 --- a/deal.II/cmake/config/CMakeLists.txt +++ b/deal.II/cmake/config/CMakeLists.txt @@ -100,8 +100,17 @@ FOREACH(_build ${DEAL_II_BUILD_TYPES}) GET_TARGET_PROPERTY(_lib ${DEAL_II_BASE_NAME}${DEAL_II_${_build}_SUFFIX} LOCATION) GET_FILENAME_COMPONENT(CONFIG_LIBRARY_${_build} "${_lib}" NAME) - SET(CONFIG_LIBRARIES_${_build} - \${DEAL_II_PATH}/\${DEAL_II_LIBRARY_RELDIR}/${CONFIG_LIBRARY_${_build}} + IF(CMAKE_SYSTEM_NAME MATCHES "CYGWIN" OR CMAKE_SYSTEM_NAME MATCHES "Windows") + SET(CONFIG_LIBRARIES_${_build} + \${DEAL_II_PATH}/\${DEAL_II_EXECUTABLE_RELDIR}/${CONFIG_LIBRARY_${_build}} + ) + ELSE() + SET(CONFIG_LIBRARIES_${_build} + \${DEAL_II_PATH}/\${DEAL_II_LIBRARY_RELDIR}/${CONFIG_LIBRARY_${_build}} + ) + ENDIF() + + LIST(APPEND CONFIG_LIBRARIES_${_build} ${DEAL_II_EXTERNAL_LIBRARIES_${_build}} ${DEAL_II_EXTERNAL_LIBRARIES} ) -- 2.39.5