]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Remove the wrong special case of reldir setup for windows. 540/head
authorLukas Korous <lukas.korous@gmail.com>
Fri, 13 Feb 2015 13:33:04 +0000 (14:33 +0100)
committerLukas Korous <lukas.korous@gmail.com>
Fri, 13 Feb 2015 13:33:04 +0000 (14:33 +0100)
cmake/config/CMakeLists.txt

index 84a7aedafdc383b4c23653c6e22a14d796fbd843..b599339d9fdeafd34ce5d6e624b4f406d922f4ff 100644 (file)
@@ -103,12 +103,8 @@ FOREACH(_build ${DEAL_II_BUILD_TYPES})
     SET(_type "STATIC")
   ENDIF()
 
-  IF(CMAKE_SYSTEM_NAME MATCHES "CYGWIN" OR CMAKE_SYSTEM_NAME MATCHES "Windows")
-    SET(_reldir "\${DEAL_II_EXECUTABLE_RELDIR}")
-  ELSE()
-    SET(_reldir "\${DEAL_II_LIBRARY_RELDIR}")
-  ENDIF()
-
+  SET(_reldir "\${DEAL_II_LIBRARY_RELDIR}")
+  
   SET(CONFIG_LIBRARIES_${_build}
     "\${DEAL_II_PATH}/${_reldir}/${CMAKE_${_type}_LIBRARY_PREFIX}${DEAL_II_BASE_NAME}${DEAL_II_${_build}_SUFFIX}${CMAKE_${_type}_LIBRARY_SUFFIX}"
     ${DEAL_II_LIBRARIES_${_build}}

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.