Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 1 | From d24c2516ae25d0ee180c1020e52114ea32230585 Mon Sep 17 00:00:00 2001 |
| 2 | From: Pascal Bach <pascal.bach@siemens.com> |
| 3 | Date: Mon, 29 Oct 2018 18:03:43 +0100 |
| 4 | Subject: [PATCH] Use relative install paths for CMake |
| 5 | |
| 6 | Files are installed via a special _PREFIX variant of the INSTALL_???_DIR |
| 7 | variable which is an absolute path. |
| 8 | |
| 9 | This not only is redundant if CMAKE_INTALL_PREFIX is set but it even causes |
| 10 | the resulting Config.cmake to be non relocatable. This means it contains absolute |
| 11 | paths to the build host. This is a problem for cross compilation in Yocto. |
| 12 | |
| 13 | This change gets rid of the absolute path and removes the no longer needed |
| 14 | _PREFIX variants. |
| 15 | |
| 16 | Upstream-Status: Submitted [https://github.com/libyui/libyui/pull/140] |
| 17 | Signed-off-by: Pascal Bach <pascal.bach@siemens.com> |
| 18 | --- |
| 19 | buildtools/LibyuiCommon.cmake | 35 ++++++++++++++--------------------- |
| 20 | 1 file changed, 14 insertions(+), 21 deletions(-) |
| 21 | |
| 22 | diff --git a/buildtools/LibyuiCommon.cmake b/buildtools/LibyuiCommon.cmake |
| 23 | index e6fbefd..5e2fc0d 100644 |
| 24 | --- a/buildtools/LibyuiCommon.cmake |
| 25 | +++ b/buildtools/LibyuiCommon.cmake |
| 26 | @@ -258,13 +258,6 @@ MACRO( SET_ENVIRONMENT ) # setup the environment vars |
| 27 | |
| 28 | SET( INSTALL_DOC_DIR "${DOC_DIR}" ) |
| 29 | |
| 30 | - FOREACH( p "DOC" LIB INCLUDE CMAKE PKGCONFIG BUILDTOOLS ) |
| 31 | - SET( var "INSTALL_${p}_DIR" ) |
| 32 | - IF( NOT IS_ABSOLUTE "${${var}}" ) |
| 33 | - SET( ${var}_PREFIX "${YPREFIX}/${${var}}" ) |
| 34 | - ENDIF( NOT IS_ABSOLUTE "${${var}}" ) |
| 35 | - ENDFOREACH() |
| 36 | - |
| 37 | ENDMACRO( SET_ENVIRONMENT ) |
| 38 | |
| 39 | MACRO( SET_SONAME ) |
| 40 | @@ -359,7 +352,7 @@ MACRO( SET_AUTODOCS ) # looks for doxygen, dot and latex and setup autodocs acc |
| 41 | IF( INSTALL_DOCS OR DOCS_ONLY ) |
| 42 | INSTALL( |
| 43 | FILES "${CMAKE_BINARY_DIR}/doc/latex/refman.pdf" |
| 44 | - DESTINATION "${INSTALL_DOC_DIR_PREFIX}" |
| 45 | + DESTINATION "${INSTALL_DOC_DIR}" |
| 46 | ) |
| 47 | ENDIF( INSTALL_DOCS OR DOCS_ONLY ) |
| 48 | |
| 49 | @@ -379,7 +372,7 @@ MACRO( SET_AUTODOCS ) # looks for doxygen, dot and latex and setup autodocs acc |
| 50 | FOREACH( p css gif html jpg js png tag ) |
| 51 | INSTALL( |
| 52 | DIRECTORY "${CMAKE_BINARY_DIR}/doc/html" |
| 53 | - DESTINATION "${INSTALL_DOC_DIR_PREFIX}" |
| 54 | + DESTINATION "${INSTALL_DOC_DIR}" |
| 55 | FILES_MATCHING PATTERN "*.${p}" |
| 56 | ) |
| 57 | ENDFOREACH() |
| 58 | @@ -638,32 +631,32 @@ MACRO( SET_INSTALL_TARGET ) |
| 59 | |
| 60 | INSTALL( |
| 61 | EXPORT ${PROJECTNAME_UC}LibraryDepends |
| 62 | - DESTINATION "${INSTALL_CMAKE_DIR_PREFIX}" |
| 63 | + DESTINATION "${INSTALL_CMAKE_DIR}" |
| 64 | COMPONENT dev |
| 65 | ) |
| 66 | |
| 67 | FOREACH( p Config.cmake ConfigVersion.cmake ) |
| 68 | INSTALL( |
| 69 | FILES "${CMAKE_BINARY_DIR}/${PROJECTNAME_UC}${p}" |
| 70 | - DESTINATION "${INSTALL_CMAKE_DIR_PREFIX}" |
| 71 | + DESTINATION "${INSTALL_CMAKE_DIR}" |
| 72 | ) |
| 73 | ENDFOREACH( p Config.cmake ConfigVersion.cmake ) |
| 74 | |
| 75 | INSTALL( |
| 76 | FILES "${CMAKE_BINARY_DIR}/${PROJECTNAME}.pc" |
| 77 | - DESTINATION "${INSTALL_PKGCONFIG_DIR_PREFIX}" |
| 78 | + DESTINATION "${INSTALL_PKGCONFIG_DIR}" |
| 79 | ) |
| 80 | |
| 81 | IF( NOT PLUGINNAME AND NOT EXTENSIONNAME ) |
| 82 | INSTALL( |
| 83 | DIRECTORY "${BUILDTOOLS_DIR}" |
| 84 | - DESTINATION "${INSTALL_BUILDTOOLS_DIR_PREFIX}" |
| 85 | + DESTINATION "${INSTALL_BUILDTOOLS_DIR}" |
| 86 | ) |
| 87 | ENDIF( NOT PLUGINNAME AND NOT EXTENSIONNAME ) |
| 88 | |
| 89 | INSTALL( |
| 90 | FILES ${BUILDTOOLS_LIST} |
| 91 | - DESTINATION "${INSTALL_BUILDTOOLS_DIR_PREFIX}" |
| 92 | + DESTINATION "${INSTALL_BUILDTOOLS_DIR}" |
| 93 | ) |
| 94 | |
| 95 | ENDMACRO( SET_INSTALL_TARGET ) |
| 96 | @@ -724,9 +717,9 @@ MACRO( PROCESS_SOURCES ) |
| 97 | INSTALL( |
| 98 | TARGETS ${TARGETLIB} |
| 99 | EXPORT ${PROJECTNAME_UC}LibraryDepends |
| 100 | - LIBRARY DESTINATION "${INSTALL_LIB_DIR_PREFIX}" |
| 101 | - ARCHIVE DESTINATION "${INSTALL_LIB_DIR_PREFIX}" |
| 102 | - PUBLIC_HEADER DESTINATION "${INSTALL_INCLUDE_DIR_PREFIX}" |
| 103 | + LIBRARY DESTINATION "${INSTALL_LIB_DIR}" |
| 104 | + ARCHIVE DESTINATION "${INSTALL_LIB_DIR}" |
| 105 | + PUBLIC_HEADER DESTINATION "${INSTALL_INCLUDE_DIR}" |
| 106 | COMPONENT dev |
| 107 | ) |
| 108 | |
| 109 | @@ -746,9 +739,9 @@ MACRO( PROCESS_SOURCES ) |
| 110 | INSTALL( |
| 111 | TARGETS ${TARGETLIB}_static |
| 112 | EXPORT ${PROJECTNAME_UC}LibraryDepends |
| 113 | - LIBRARY DESTINATION "${INSTALL_LIB_DIR_PREFIX}" |
| 114 | - ARCHIVE DESTINATION "${INSTALL_LIB_DIR_PREFIX}" |
| 115 | - PUBLIC_HEADER DESTINATION "${INSTALL_INCLUDE_DIR_PREFIX}" |
| 116 | + LIBRARY DESTINATION "${INSTALL_LIB_DIR}" |
| 117 | + ARCHIVE DESTINATION "${INSTALL_LIB_DIR}" |
| 118 | + PUBLIC_HEADER DESTINATION "${INSTALL_INCLUDE_DIR}" |
| 119 | COMPONENT dev |
| 120 | ) |
| 121 | |
| 122 | @@ -776,7 +769,7 @@ MACRO( PROCESS_EXAMPLES ) |
| 123 | |
| 124 | INSTALL( |
| 125 | FILES ${EXAMPLES_LIST} |
| 126 | - DESTINATION "${INSTALL_DOC_DIR_PREFIX}/examples" |
| 127 | + DESTINATION "${INSTALL_DOC_DIR}/examples" |
| 128 | ) |
| 129 | |
| 130 | ENDMACRO( PROCESS_EXAMPLES ) |