From: maier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Sat, 2 Nov 2013 12:11:19 +0000 (+0000)
Subject: Bugfix: Use DEAL_II_EXECUTABLE_RELDIR for Windows targets
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3cb1e7ed72da71817b732e3f46283446ec48839c;p=dealii-svn.git

Bugfix: Use DEAL_II_EXECUTABLE_RELDIR for Windows targets

git-svn-id: https://svn.dealii.org/trunk@31511 0785d39b-7218-0410-832d-ea1e28bc413d
---

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}
     )