use GNUInstallDirs and install libff in CMAKE_INSTALL_FULL_LIBDIR

eosnetworkfoundation · Jul 11, 2022 · 0587e77 · 0587e77
1 parent e116069
commit 0587e77
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,6 +2,8 @@ cmake_minimum_required(VERSION 2.8)
 
 project (libff)
 
+include( GNUInstallDirs )
+
 # Default to RelWithDebInfo configuration if no configuration is explicitly specified.
 if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
   set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "Build type on single-configuration generators" FORCE)

diff --git a/libff/CMakeLists.txt b/libff/CMakeLists.txt
@@ -78,7 +78,7 @@ install(
 )
 
 install(
-  TARGETS ff DESTINATION lib ${INSTALL_COMPONENT_ARGS}
+  TARGETS ff DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} ${INSTALL_COMPONENT_ARGS}
 )
 
 # Tests
-Original file line number
+Diff line change
@@ Expand Up / @@ -78,7 +78,7 @@ install( @@
     )
     install(
-      TARGETS ff DESTINATION lib ${INSTALL_COMPONENT_ARGS}
+      TARGETS ff DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} ${INSTALL_COMPONENT_ARGS}
     )
     # Tests
@@ Expand Down @@