Merge pull request #130 from nE0sIghT/bugfix/libdir

cmake: don't hardcode libdir value
JosephP91 · Oct 5, 2020 · 906c259 · 906c259
2 parents 2aa6061 + 4b41580
commit 906c259
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,7 @@
 cmake_minimum_required(VERSION 3.11...3.15)
 
+include(GNUInstallDirs)
+
 #if using an older VERSION of curl ocsp stapling can be disabled
 set(CURL_MIN_VERSION "7.28.0")
 
@@ -38,4 +40,5 @@ add_subdirectory(test)
 set(CURLCPP_LIB_LOCATION "$<TARGET_FILE:${curlcpp}>")
 
 configure_file(CMake/curlcppConfig.cmake.in
-  ${CMAKE_INSTALL_PREFIX}/lib/curlcpp/curlcppConfig.cmake @ONLY)
+  ${CMAKE_BINARY_DIR}/curlcppConfig.cmake @ONLY)
+install (FILES ${CMAKE_BINARY_DIR}/curlcppConfig.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/curlcpp)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -78,5 +78,5 @@ if(IPO_SUPPORTED AND CMAKE_BUILD_TYPE STREQUAL "Release")
     set_target_properties(curlcpp PROPERTIES INTERPROCEDURAL_OPTIMIZATION TRUE)
 endif()
 
-install (TARGETS curlcpp LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
+install (TARGETS curlcpp LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
 install (FILES ${CURLCPP_HEADER_LIST} DESTINATION include/curlcpp)