From efd77bbbc94434eca1fe1611fb8f0be047531c16 Mon Sep 17 00:00:00 2001 From: Oliver Duis Date: Mon, 11 Jul 2011 16:05:16 +0200 Subject: [PATCH] Fix for CMAKE bundle option on behalf of MKyral; see issue 184 --- CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 001bf784f..cd6a5530f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -92,7 +92,11 @@ if (NOT DEFINED LIBDIR) else (BUILD_BUNDLE) # Respect CMAKE_INSTALL_LIBDIR if set if (DEFINED CMAKE_INSTALL_LIBDIR) - set (LIBDIR ${CMAKE_INSTALL_LIBDIR}) + if (IS_ABSOLUTE ${LIBDIR}) + set (LIBDIR ${CMAKE_INSTALL_LIBDIR}) + else (IS_ABSOLUTE ${LIBDIR}) + set (LIBDIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}) + endif (IS_ABSOLUTE ${LIBDIR}) else (DEFINED CMAKE_INSTALL_LIBDIR) set (LIBDIR ${CMAKE_INSTALL_PREFIX}/lib) endif (DEFINED CMAKE_INSTALL_LIBDIR)