From c6176e2415941f4c18f9124e9c2dd5cb1f838b43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m@gmail.com>
Date: Sun, 30 Sep 2018 21:28:43 +0200
Subject: [PATCH] Fix library installation directory
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Robert-André Mauchin <zebob.m@gmail.com>
---
src/CMakeLists.txt | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4adba75..7e6254f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -197,9 +197,9 @@ set_target_properties(elisaLib PROPERTIES
if (NOT APPLE AND NOT WIN32)
install(TARGETS elisaLib
- LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/elisa
- RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/elisa
- BUNDLE DESTINATION ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/elisa
+ LIBRARY DESTINATION ${LIB_INSTALL_DIR}/elisa
+ RUNTIME DESTINATION ${LIB_INSTALL_DIR}/elisa
+ BUNDLE DESTINATION ${LIB_INSTALL_DIR}/elisa
)
else()
install(TARGETS elisaLib ${INSTALL_TARGETS_DEFAULT_ARGS})
@@ -232,7 +232,7 @@ set_target_properties(elisaqmlplugin PROPERTIES
if (NOT APPLE AND NOT WIN32)
set_target_properties(elisaqmlplugin PROPERTIES
- INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/elisa;${CMAKE_INSTALL_RPATH}"
+ INSTALL_RPATH "${LIB_INSTALL_DIR}/elisa;${CMAKE_INSTALL_RPATH}"
)
endif()
@@ -351,7 +351,7 @@ if (Qt5Quick_FOUND AND Qt5Widgets_FOUND)
if (NOT APPLE AND NOT WIN32)
set_target_properties(elisa PROPERTIES
- INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/elisa;${CMAKE_INSTALL_RPATH}"
+ INSTALL_RPATH "${LIB_INSTALL_DIR}/elisa;${CMAKE_INSTALL_RPATH}"
)
endif()
--
2.19.0