You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
28 lines
1.6 KiB
28 lines
1.6 KiB
diff -Naur bctoolbox-0.0.3.orig/CMakeLists.txt bctoolbox-0.0.3/CMakeLists.txt |
|
--- bctoolbox-0.0.3.orig/CMakeLists.txt 2016-04-08 15:53:01.000000000 +0200 |
|
+++ bctoolbox-0.0.3/CMakeLists.txt 2016-05-16 21:56:44.801533595 +0200 |
|
@@ -51,24 +51,6 @@ |
|
|
|
add_subdirectory(build) |
|
|
|
-# Note for Gnu/Unix systems: |
|
-# The library install director should ideally be set, according to GNUInstallDirs, |
|
-# to ${CMAKE_INSTALL_LIBDIR} for libraries, which are OS specific. |
|
-# HOWEVER autotools does not care about these specificities and ALWAYS sets them |
|
-# to $(exec_prefix)/lib (cf https://www.gnu.org/prep/standards/html_node/Directory-Variables.html) |
|
-# When using a custom prefix, we should follow the autotools guidelines because any project using pkg-config to find our library |
|
-# will expect it to be in $(exec_prefix)/lib, and NOT in $(exec_prefix)/${CMAKE_INSTALL_LIBDIR} since |
|
-# pkg-config does not let us introduce an -rpath settings to tell it where our library is located. |
|
-# Conversely, when NOT using a custom prefix, we can properly install our library in ${CMAKE_INSTALL_LIBDIR} |
|
-# because systems add extra locations for pkg-config to search in. |
|
-if("${CPACK_GENERATOR}" STREQUAL "RPM" OR "${CPACK_GENERATOR}" STREQUAL "DEB") |
|
- # do nothing, we are using the "officials" install prefix |
|
-else() |
|
- # force them to the default autotools values |
|
- message("Setting CMAKE_INSTALL_LIBDIR to ${CMAKE_INSTALL_PREFIX}/lib for non-package build") |
|
- set(CMAKE_INSTALL_LIBDIR ${CMAKE_INSTALL_PREFIX}/lib) |
|
-endif() |
|
- |
|
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") |
|
|
|
if(NOT CMAKE_INSTALL_RPATH AND CMAKE_INSTALL_PREFIX)
|
|
|