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

Collapse All | Expand All

(-)a/CMakeLists.txt (-3 / +4 lines)
Lines 87-97 if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) Link Here
87
    set(LLVM_INCLUDE_TESTS OFF)
87
    set(LLVM_INCLUDE_TESTS OFF)
88
  endif()
88
  endif()
89
89
90
  set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX})
90
  set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib${LIBUNWIND_LIBDIR_SUFFIX})
91
  set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX})
91
  set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib${LIBUNWIND_LIBDIR_SUFFIX})
92
else()
92
else()
93
  set(LLVM_MAIN_SRC_DIR "${CMAKE_SOURCE_DIR}" CACHE PATH "Path to LLVM source tree")
93
  set(LLVM_MAIN_SRC_DIR "${CMAKE_SOURCE_DIR}" CACHE PATH "Path to LLVM source tree")
94
  set(LLVM_LIT "${CMAKE_SOURCE_DIR}/utils/lit/lit.py")
94
  set(LLVM_LIT "${CMAKE_SOURCE_DIR}/utils/lit/lit.py")
95
  set(LIBCXXABI_LIBDIR_SUFFIX ${LLVM_LIBDIR_SUFFIX})
95
endif()
96
endif()
96
97
97
#===============================================================================
98
#===============================================================================
Lines 133-139 set(CMAKE_MODULE_PATH Link Here
133
set(LIBUNWIND_COMPILER    ${CMAKE_CXX_COMPILER})
134
set(LIBUNWIND_COMPILER    ${CMAKE_CXX_COMPILER})
134
set(LIBUNWIND_SOURCE_DIR  ${CMAKE_CURRENT_SOURCE_DIR})
135
set(LIBUNWIND_SOURCE_DIR  ${CMAKE_CURRENT_SOURCE_DIR})
135
set(LIBUNWIND_BINARY_DIR  ${CMAKE_CURRENT_BINARY_DIR})
136
set(LIBUNWIND_BINARY_DIR  ${CMAKE_CURRENT_BINARY_DIR})
136
set(LIBUNWIND_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX})
137
set(LIBUNWIND_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBUNWIND_LIBDIR_SUFFIX})
137
138
138
set(LIBUNWIND_C_FLAGS "")
139
set(LIBUNWIND_C_FLAGS "")
139
set(LIBUNWIND_CXX_FLAGS "")
140
set(LIBUNWIND_CXX_FLAGS "")
(-)a/src/CMakeLists.txt (-2 / +2 lines)
Lines 112-119 set_property(SOURCE ${LIBUNWIND_C_SOURCES} Link Here
112
             APPEND_STRING PROPERTY COMPILE_FLAGS " ${CMAKE_C_FLAGS} ${LIBUNWIND_C_FLAGS}")
112
             APPEND_STRING PROPERTY COMPILE_FLAGS " ${CMAKE_C_FLAGS} ${LIBUNWIND_C_FLAGS}")
113
113
114
if (LIBUNWIND_ENABLE_SHARED)
114
if (LIBUNWIND_ENABLE_SHARED)
115
  install(TARGETS unwind LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX})
115
  install(TARGETS unwind LIBRARY DESTINATION lib${LIBUNWIND_LIBDIR_SUFFIX})
116
endif ()
116
endif ()
117
if (LIBUNWIND_ENABLE_STATIC)
117
if (LIBUNWIND_ENABLE_STATIC)
118
  install(TARGETS unwind_static ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX})
118
  install(TARGETS unwind_static ARCHIVE DESTINATION lib${LIBUNWIND_LIBDIR_SUFFIX})
119
endif ()
119
endif ()

Return to bug 607390