From 09bfc5927fe204392e2160c04a240df4a6a2a3e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 27 May 2012 21:52:21 +0200 Subject: [PATCH] Updated FindCorrade.cmake. --- modules/FindCorrade.cmake | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/modules/FindCorrade.cmake b/modules/FindCorrade.cmake index d8b9a7233..36bfe736f 100644 --- a/modules/FindCorrade.cmake +++ b/modules/FindCorrade.cmake @@ -49,19 +49,11 @@ endif() if(CORRADE_FOUND) include(CorradeMacros) - # Installation dirs - if(WIN32) - set_parent_scope(CORRADE_BINARY_INSTALL_DIR .) - set_parent_scope(CORRADE_LIBRARY_INSTALL_DIR .) - set_parent_scope(CORRADE_CMAKE_MODULE_INSTALL_DIR Modules) - set_parent_scope(CORRADE_INCLUDE_INSTALL_DIR include/Corrade) - else() - include(CorradeLibSuffix) - set_parent_scope(CORRADE_BINARY_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/bin) - set_parent_scope(CORRADE_LIBRARY_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}) - set_parent_scope(CORRADE_CMAKE_MODULE_INSTALL_DIR ${CMAKE_ROOT}/Modules) - set_parent_scope(CORRADE_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include/Corrade) - endif() + include(CorradeLibSuffix) + set_parent_scope(CORRADE_BINARY_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/bin) + set_parent_scope(CORRADE_LIBRARY_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}) + set_parent_scope(CORRADE_CMAKE_MODULE_INSTALL_DIR ${CMAKE_ROOT}/Modules) + set_parent_scope(CORRADE_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include/Corrade) set_parent_scope(CORRADE_LIBRARIES ${CORRADE_UTILITY_LIBRARY} ${CORRADE_PLUGINMANAGER_LIBRARY}) endif()