]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Bugfix: Use DEAL_II_EXECUTABLE_RELDIR for Windows targets
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Sat, 2 Nov 2013 12:11:19 +0000 (12:11 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Sat, 2 Nov 2013 12:11:19 +0000 (12:11 +0000)
git-svn-id: https://svn.dealii.org/trunk@31511 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/cmake/config/CMakeLists.txt

index eea6fdf8f090da5edd0ffd39ed57485776c624a6..ed805981f84f85d4d168ddc4fdfa41f813e294bb 100644 (file)
@@ -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}
     )

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.