Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 523718 | Differences between
and this patch

Collapse All | Expand All

(-)a/CMakeLists.txt (-9 / +3 lines)
Lines 216-227 set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) Link Here
216
# Installation directories
216
# Installation directories
217
217
218
if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
218
if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
219
    # Debian multiarch support
220
    execute_process(COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH
221
        OUTPUT_VARIABLE ARCH_SUBDIR
222
        ERROR_QUIET
223
        OUTPUT_STRIP_TRAILING_WHITESPACE
224
    )
225
    CHECK_INCLUDE_FILES(proc/readproc.h READPROC_H_FOUND)
219
    CHECK_INCLUDE_FILES(proc/readproc.h READPROC_H_FOUND)
226
    if (READPROC_H_FOUND)
220
    if (READPROC_H_FOUND)
227
        add_definitions (-DHAVE_READPROC_H)
221
        add_definitions (-DHAVE_READPROC_H)
Lines 237-247 if (WIN32 OR APPLE) Link Here
237
    set (LIB_ARCH_INSTALL_DIR lib)
231
    set (LIB_ARCH_INSTALL_DIR lib)
238
else ()
232
else ()
239
    set (DOC_INSTALL_DIR share/doc/${CMAKE_PROJECT_NAME})
233
    set (DOC_INSTALL_DIR share/doc/${CMAKE_PROJECT_NAME})
240
    set (LIB_INSTALL_DIR lib${LIB_SUFFIX}/${CMAKE_PROJECT_NAME})
234
    set (LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/${CMAKE_PROJECT_NAME})
241
    if (ARCH_SUBDIR)
235
    if (ARCH_SUBDIR)
242
        set (LIB_ARCH_INSTALL_DIR lib/${ARCH_SUBDIR}/${CMAKE_PROJECT_NAME})
236
        set (LIB_ARCH_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/${ARCH_SUBDIR}/${CMAKE_PROJECT_NAME})
243
    else ()
237
    else ()
244
        set (LIB_ARCH_INSTALL_DIR lib${LIB_SUFFIX}/${CMAKE_PROJECT_NAME})
238
        set (LIB_ARCH_INSTALL_DIR ${LIB_INSTALL_DIR})
245
    endif ()
239
    endif ()
246
endif ()
240
endif ()
247
241

Return to bug 523718