From: Lukas Korous Date: Fri, 13 Feb 2015 13:33:04 +0000 (+0100) Subject: Remove the wrong special case of reldir setup for windows. X-Git-Tag: v8.3.0-rc1~472^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec58e3d81c298c3c24c281c3ab75de8a8678a9cb;p=dealii.git Remove the wrong special case of reldir setup for windows. --- diff --git a/cmake/config/CMakeLists.txt b/cmake/config/CMakeLists.txt index 84a7aedafd..b599339d9f 100644 --- a/cmake/config/CMakeLists.txt +++ b/cmake/config/CMakeLists.txt @@ -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}}