Blob Blame History Raw
From a0ef151426aaf43068b076ab251f5e56d14bb3a2 Mon Sep 17 00:00:00 2001
From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
Date: Tue, 18 Aug 2020 21:58:56 +0100
Subject: [PATCH 2/2] Use LIB_INSTALL_DIR instead of hardcoding lib

---
 CMakeLists.txt         | 9 +++++++--
 src/lib/CMakeLists.txt | 4 ++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 315729f..1cd1f42 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,6 +60,11 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "CYGWIN")
   set(CYGWIN 1)
 endif()
 
+# set up libdir
+if(NOT DEFINED LIB_INSTALL_DIR)
+    set(LIB_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib)
+endif()
+
 # =============================================================================
 # Include cmake modules
 # =============================================================================
@@ -186,8 +191,8 @@ add_subdirectory(src/bin)
 # =============================================================================
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/src/include/ DESTINATION include)
 if(NOT IV_AS_SUBPROJECT)
-  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cmake/iv-config.cmake DESTINATION share/cmake)
-  install(EXPORT iv DESTINATION share/cmake)
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cmake/iv-config.cmake DESTINATION ${LIB_INSTALL_DIR}/cmake/iv)
+    install(EXPORT iv DESTINATION ${LIB_INSTALL_DIR}/cmake/iv)
 endif()
 
 # =============================================================================
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
index 71f74b7..b783083 100644
--- a/src/lib/CMakeLists.txt
+++ b/src/lib/CMakeLists.txt
@@ -496,12 +496,12 @@ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/app-defaults/ DESTINATION share/ap
 if(NOT IV_WINDOWS_BUILD)
   install(TARGETS interviews
           EXPORT iv
-          DESTINATION lib
+          DESTINATION ${LIB_INSTALL_DIR}
           INCLUDES
           DESTINATION $<INSTALL_INTERFACE:include>)
   install(TARGETS unidraw
           EXPORT iv
-          DESTINATION lib
+          DESTINATION ${LIB_INSTALL_DIR}
           INCLUDES
           DESTINATION $<INSTALL_INTERFACE:include>)
 else()
-- 
2.26.2