Skip to content

Commit 43ba97e

Browse files
ldionneldionne
authored
[runtimes][NFC] Reindent CMake files (#111821)
This is a purely mechanical commit for fixing the indentation of the runtimes' CMakeLists files after #80007. That PR didn't update the indentation in order to make the diff easier to review and for merge conflicts to be easier to resolve (for downstream changes). This doesn't change any code, it only reindents it.
1 parent 36c34ec commit 43ba97e

File tree

3 files changed

+187
-187
lines changed

3 files changed

+187
-187
lines changed

‎libcxx/src/CMakeLists.txt

+97-97
Original file line numberDiff line numberDiff line change
@@ -173,76 +173,76 @@ split_list(LIBCXX_COMPILE_FLAGS)
173173
split_list(LIBCXX_LINK_FLAGS)
174174

175175
# Build the shared library.
176-
add_library(cxx_shared SHARED ${LIBCXX_SOURCES} ${LIBCXX_HEADERS})
177-
target_include_directories(cxx_shared PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
178-
target_link_libraries(cxx_shared PUBLIC cxx-headers libcxx-libc-shared
179-
PRIVATE ${LIBCXX_LIBRARIES})
180-
set_target_properties(cxx_shared
181-
PROPERTIES
182-
EXCLUDE_FROM_ALL "$<IF:$<BOOL:${LIBCXX_ENABLE_SHARED}>,FALSE,TRUE>"
183-
COMPILE_FLAGS "${LIBCXX_COMPILE_FLAGS}"
184-
LINK_FLAGS "${LIBCXX_LINK_FLAGS}"
185-
OUTPUT_NAME "${LIBCXX_SHARED_OUTPUT_NAME}"
186-
VERSION "${LIBCXX_LIBRARY_VERSION}"
187-
SOVERSION "${LIBCXX_ABI_VERSION}"
188-
DEFINE_SYMBOL ""
176+
add_library(cxx_shared SHARED ${LIBCXX_SOURCES} ${LIBCXX_HEADERS})
177+
target_include_directories(cxx_shared PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
178+
target_link_libraries(cxx_shared PUBLIC cxx-headers libcxx-libc-shared
179+
PRIVATE ${LIBCXX_LIBRARIES})
180+
set_target_properties(cxx_shared
181+
PROPERTIES
182+
EXCLUDE_FROM_ALL "$<IF:$<BOOL:${LIBCXX_ENABLE_SHARED}>,FALSE,TRUE>"
183+
COMPILE_FLAGS "${LIBCXX_COMPILE_FLAGS}"
184+
LINK_FLAGS "${LIBCXX_LINK_FLAGS}"
185+
OUTPUT_NAME "${LIBCXX_SHARED_OUTPUT_NAME}"
186+
VERSION "${LIBCXX_LIBRARY_VERSION}"
187+
SOVERSION "${LIBCXX_ABI_VERSION}"
188+
DEFINE_SYMBOL ""
189+
)
190+
cxx_add_common_build_flags(cxx_shared)
191+
192+
if(ZOS)
193+
add_custom_command(TARGET cxx_shared POST_BUILD
194+
COMMAND
195+
${LIBCXX_SOURCE_DIR}/utils/zos_rename_dll_side_deck.sh
196+
$<TARGET_LINKER_FILE_NAME:cxx_shared> $<TARGET_FILE_NAME:cxx_shared> "${LIBCXX_DLL_NAME}"
197+
COMMENT "Rename dll name inside the side deck file"
198+
WORKING_DIRECTORY $<TARGET_FILE_DIR:cxx_shared>
189199
)
190-
cxx_add_common_build_flags(cxx_shared)
191-
192-
if(ZOS)
193-
add_custom_command(TARGET cxx_shared POST_BUILD
194-
COMMAND
195-
${LIBCXX_SOURCE_DIR}/utils/zos_rename_dll_side_deck.sh
196-
$<TARGET_LINKER_FILE_NAME:cxx_shared> $<TARGET_FILE_NAME:cxx_shared> "${LIBCXX_DLL_NAME}"
197-
COMMENT "Rename dll name inside the side deck file"
198-
WORKING_DIRECTORY $<TARGET_FILE_DIR:cxx_shared>
199-
)
200-
endif()
200+
endif()
201201

202-
# Link against libc++abi
203-
if (LIBCXX_STATICALLY_LINK_ABI_IN_SHARED_LIBRARY)
204-
target_link_libraries(cxx_shared PRIVATE libcxx-abi-shared-objects)
205-
else()
206-
target_link_libraries(cxx_shared PUBLIC libcxx-abi-shared)
207-
endif()
202+
# Link against libc++abi
203+
if (LIBCXX_STATICALLY_LINK_ABI_IN_SHARED_LIBRARY)
204+
target_link_libraries(cxx_shared PRIVATE libcxx-abi-shared-objects)
205+
else()
206+
target_link_libraries(cxx_shared PUBLIC libcxx-abi-shared)
207+
endif()
208208

209-
# Maybe force some symbols to be weak, not weak or not exported.
210-
# TODO: This shouldn't depend on the platform, and ideally it should be done in the sources.
211-
if (APPLE AND LIBCXX_CXX_ABI MATCHES "libcxxabi$"
212-
AND NOT LIBCXX_STATICALLY_LINK_ABI_IN_SHARED_LIBRARY)
213-
target_link_libraries(cxx_shared PRIVATE
214-
"-Wl,-force_symbols_not_weak_list,${CMAKE_CURRENT_SOURCE_DIR}/../lib/notweak.exp"
215-
"-Wl,-force_symbols_weak_list,${CMAKE_CURRENT_SOURCE_DIR}/../lib/weak.exp")
216-
endif()
209+
# Maybe force some symbols to be weak, not weak or not exported.
210+
# TODO: This shouldn't depend on the platform, and ideally it should be done in the sources.
211+
if (APPLE AND LIBCXX_CXX_ABI MATCHES "libcxxabi$"
212+
AND NOT LIBCXX_STATICALLY_LINK_ABI_IN_SHARED_LIBRARY)
213+
target_link_libraries(cxx_shared PRIVATE
214+
"-Wl,-force_symbols_not_weak_list,${CMAKE_CURRENT_SOURCE_DIR}/../lib/notweak.exp"
215+
"-Wl,-force_symbols_weak_list,${CMAKE_CURRENT_SOURCE_DIR}/../lib/weak.exp")
216+
endif()
217217

218-
# Generate a linker script in place of a libc++.so symlink.
219-
if (LIBCXX_ENABLE_ABI_LINKER_SCRIPT)
220-
set(link_libraries)
221-
222-
set(imported_libname "$<TARGET_PROPERTY:libcxx-abi-shared,IMPORTED_LIBNAME>")
223-
set(output_name "$<TARGET_PROPERTY:libcxx-abi-shared,OUTPUT_NAME>")
224-
string(APPEND link_libraries "${CMAKE_LINK_LIBRARY_FLAG}$<IF:$<BOOL:${imported_libname}>,${imported_libname},${output_name}>")
225-
226-
# TODO: Move to the same approach as above for the unwind library
227-
if (LIBCXXABI_USE_LLVM_UNWINDER)
228-
if (LIBCXXABI_STATICALLY_LINK_UNWINDER_IN_SHARED_LIBRARY)
229-
# libunwind is already included in libc++abi
230-
elseif (TARGET unwind_shared OR HAVE_LIBUNWIND)
231-
string(APPEND link_libraries " ${CMAKE_LINK_LIBRARY_FLAG}$<TARGET_PROPERTY:unwind_shared,OUTPUT_NAME>")
232-
else()
233-
string(APPEND link_libraries " ${CMAKE_LINK_LIBRARY_FLAG}unwind")
234-
endif()
235-
endif()
218+
# Generate a linker script in place of a libc++.so symlink.
219+
if (LIBCXX_ENABLE_ABI_LINKER_SCRIPT)
220+
set(link_libraries)
236221

237-
set(linker_script "INPUT($<TARGET_SONAME_FILE_NAME:cxx_shared> ${link_libraries})")
238-
add_custom_command(TARGET cxx_shared POST_BUILD
239-
COMMAND "${CMAKE_COMMAND}" -E remove "$<TARGET_LINKER_FILE:cxx_shared>"
240-
COMMAND "${CMAKE_COMMAND}" -E echo "${linker_script}" > "$<TARGET_LINKER_FILE:cxx_shared>"
241-
COMMENT "Generating linker script: '${linker_script}' as file $<TARGET_LINKER_FILE:cxx_shared>"
242-
VERBATIM
243-
)
222+
set(imported_libname "$<TARGET_PROPERTY:libcxx-abi-shared,IMPORTED_LIBNAME>")
223+
set(output_name "$<TARGET_PROPERTY:libcxx-abi-shared,OUTPUT_NAME>")
224+
string(APPEND link_libraries "${CMAKE_LINK_LIBRARY_FLAG}$<IF:$<BOOL:${imported_libname}>,${imported_libname},${output_name}>")
225+
226+
# TODO: Move to the same approach as above for the unwind library
227+
if (LIBCXXABI_USE_LLVM_UNWINDER)
228+
if (LIBCXXABI_STATICALLY_LINK_UNWINDER_IN_SHARED_LIBRARY)
229+
# libunwind is already included in libc++abi
230+
elseif (TARGET unwind_shared OR HAVE_LIBUNWIND)
231+
string(APPEND link_libraries " ${CMAKE_LINK_LIBRARY_FLAG}$<TARGET_PROPERTY:unwind_shared,OUTPUT_NAME>")
232+
else()
233+
string(APPEND link_libraries " ${CMAKE_LINK_LIBRARY_FLAG}unwind")
234+
endif()
244235
endif()
245236

237+
set(linker_script "INPUT($<TARGET_SONAME_FILE_NAME:cxx_shared> ${link_libraries})")
238+
add_custom_command(TARGET cxx_shared POST_BUILD
239+
COMMAND "${CMAKE_COMMAND}" -E remove "$<TARGET_LINKER_FILE:cxx_shared>"
240+
COMMAND "${CMAKE_COMMAND}" -E echo "${linker_script}" > "$<TARGET_LINKER_FILE:cxx_shared>"
241+
COMMENT "Generating linker script: '${linker_script}' as file $<TARGET_LINKER_FILE:cxx_shared>"
242+
VERBATIM
243+
)
244+
endif()
245+
246246
if (LIBCXX_ENABLE_SHARED)
247247
list(APPEND LIBCXX_BUILD_TARGETS "cxx_shared")
248248
endif()
@@ -263,43 +263,43 @@ endif()
263263
set(CMAKE_STATIC_LIBRARY_PREFIX "lib")
264264

265265
# Build the static library.
266-
add_library(cxx_static STATIC ${LIBCXX_SOURCES} ${LIBCXX_HEADERS})
267-
target_include_directories(cxx_static PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
268-
target_link_libraries(cxx_static PUBLIC cxx-headers libcxx-libc-static
269-
PRIVATE ${LIBCXX_LIBRARIES}
270-
PRIVATE libcxx-abi-static)
271-
set_target_properties(cxx_static
272-
PROPERTIES
273-
EXCLUDE_FROM_ALL "$<IF:$<BOOL:${LIBCXX_ENABLE_STATIC}>,FALSE,TRUE>"
274-
COMPILE_FLAGS "${LIBCXX_COMPILE_FLAGS}"
275-
LINK_FLAGS "${LIBCXX_LINK_FLAGS}"
276-
OUTPUT_NAME "${LIBCXX_STATIC_OUTPUT_NAME}"
277-
)
278-
cxx_add_common_build_flags(cxx_static)
279-
280-
if (LIBCXX_HERMETIC_STATIC_LIBRARY)
281-
# If the hermetic library doesn't define the operator new/delete functions
282-
# then its code shouldn't declare them with hidden visibility. They might
283-
# actually be provided by a shared library at link time.
284-
if (LIBCXX_ENABLE_NEW_DELETE_DEFINITIONS)
285-
append_flags_if_supported(CXX_STATIC_LIBRARY_FLAGS -fvisibility-global-new-delete=force-hidden)
286-
if (NOT CXX_SUPPORTS_FVISIBILITY_GLOBAL_NEW_DELETE_EQ_FORCE_HIDDEN_FLAG)
287-
append_flags_if_supported(CXX_STATIC_LIBRARY_FLAGS -fvisibility-global-new-delete-hidden)
288-
endif()
266+
add_library(cxx_static STATIC ${LIBCXX_SOURCES} ${LIBCXX_HEADERS})
267+
target_include_directories(cxx_static PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
268+
target_link_libraries(cxx_static PUBLIC cxx-headers libcxx-libc-static
269+
PRIVATE ${LIBCXX_LIBRARIES}
270+
PRIVATE libcxx-abi-static)
271+
set_target_properties(cxx_static
272+
PROPERTIES
273+
EXCLUDE_FROM_ALL "$<IF:$<BOOL:${LIBCXX_ENABLE_STATIC}>,FALSE,TRUE>"
274+
COMPILE_FLAGS "${LIBCXX_COMPILE_FLAGS}"
275+
LINK_FLAGS "${LIBCXX_LINK_FLAGS}"
276+
OUTPUT_NAME "${LIBCXX_STATIC_OUTPUT_NAME}"
277+
)
278+
cxx_add_common_build_flags(cxx_static)
279+
280+
if (LIBCXX_HERMETIC_STATIC_LIBRARY)
281+
# If the hermetic library doesn't define the operator new/delete functions
282+
# then its code shouldn't declare them with hidden visibility. They might
283+
# actually be provided by a shared library at link time.
284+
if (LIBCXX_ENABLE_NEW_DELETE_DEFINITIONS)
285+
append_flags_if_supported(CXX_STATIC_LIBRARY_FLAGS -fvisibility-global-new-delete=force-hidden)
286+
if (NOT CXX_SUPPORTS_FVISIBILITY_GLOBAL_NEW_DELETE_EQ_FORCE_HIDDEN_FLAG)
287+
append_flags_if_supported(CXX_STATIC_LIBRARY_FLAGS -fvisibility-global-new-delete-hidden)
289288
endif()
290-
target_compile_options(cxx_static PRIVATE ${CXX_STATIC_LIBRARY_FLAGS})
291-
# _LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS can be defined in __config_site
292-
# too. Define it in the same way here, to avoid redefinition conflicts.
293-
target_compile_definitions(cxx_static PRIVATE _LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS=)
294289
endif()
290+
target_compile_options(cxx_static PRIVATE ${CXX_STATIC_LIBRARY_FLAGS})
291+
# _LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS can be defined in __config_site
292+
# too. Define it in the same way here, to avoid redefinition conflicts.
293+
target_compile_definitions(cxx_static PRIVATE _LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS=)
294+
endif()
295295

296-
if (LIBCXX_ENABLE_STATIC)
297-
list(APPEND LIBCXX_BUILD_TARGETS "cxx_static")
298-
endif()
299-
# Attempt to merge the libc++.a archive and the ABI library archive into one.
300-
if (LIBCXX_STATICALLY_LINK_ABI_IN_STATIC_LIBRARY)
301-
target_link_libraries(cxx_static PRIVATE libcxx-abi-static-objects)
302-
endif()
296+
if (LIBCXX_ENABLE_STATIC)
297+
list(APPEND LIBCXX_BUILD_TARGETS "cxx_static")
298+
endif()
299+
# Attempt to merge the libc++.a archive and the ABI library archive into one.
300+
if (LIBCXX_STATICALLY_LINK_ABI_IN_STATIC_LIBRARY)
301+
target_link_libraries(cxx_static PRIVATE libcxx-abi-static-objects)
302+
endif()
303303

304304
# Add a meta-target for both libraries.
305305
add_custom_target(cxx DEPENDS ${LIBCXX_BUILD_TARGETS})

‎libcxxabi/src/CMakeLists.txt

+70-70
Original file line numberDiff line numberDiff line change
@@ -184,78 +184,78 @@ if (CMAKE_POSITION_INDEPENDENT_CODE OR NOT DEFINED CMAKE_POSITION_INDEPENDENT_CO
184184
endif()
185185
target_compile_options(cxxabi_shared_objects PRIVATE "${LIBCXXABI_ADDITIONAL_COMPILE_FLAGS}")
186186

187-
add_library(cxxabi_shared SHARED)
188-
set_target_properties(cxxabi_shared
189-
PROPERTIES
190-
EXCLUDE_FROM_ALL "$<IF:$<BOOL:${LIBCXXABI_ENABLE_SHARED}>,FALSE,TRUE>"
191-
LINK_FLAGS "${LIBCXXABI_LINK_FLAGS}"
192-
OUTPUT_NAME "${LIBCXXABI_SHARED_OUTPUT_NAME}"
193-
SOVERSION "1"
194-
VERSION "${LIBCXXABI_LIBRARY_VERSION}"
195-
)
187+
add_library(cxxabi_shared SHARED)
188+
set_target_properties(cxxabi_shared
189+
PROPERTIES
190+
EXCLUDE_FROM_ALL "$<IF:$<BOOL:${LIBCXXABI_ENABLE_SHARED}>,FALSE,TRUE>"
191+
LINK_FLAGS "${LIBCXXABI_LINK_FLAGS}"
192+
OUTPUT_NAME "${LIBCXXABI_SHARED_OUTPUT_NAME}"
193+
SOVERSION "1"
194+
VERSION "${LIBCXXABI_LIBRARY_VERSION}"
195+
)
196196

197-
if (ZOS)
198-
add_custom_command(TARGET cxxabi_shared POST_BUILD
199-
COMMAND
200-
${LIBCXXABI_LIBCXX_PATH}/utils/zos_rename_dll_side_deck.sh
201-
$<TARGET_LINKER_FILE_NAME:cxxabi_shared> $<TARGET_FILE_NAME:cxxabi_shared> "${LIBCXXABI_DLL_NAME}"
202-
COMMENT "Rename dll name inside the side deck file"
203-
WORKING_DIRECTORY $<TARGET_FILE_DIR:cxxabi_shared>
204-
)
205-
endif ()
197+
if (ZOS)
198+
add_custom_command(TARGET cxxabi_shared POST_BUILD
199+
COMMAND
200+
${LIBCXXABI_LIBCXX_PATH}/utils/zos_rename_dll_side_deck.sh
201+
$<TARGET_LINKER_FILE_NAME:cxxabi_shared> $<TARGET_FILE_NAME:cxxabi_shared> "${LIBCXXABI_DLL_NAME}"
202+
COMMENT "Rename dll name inside the side deck file"
203+
WORKING_DIRECTORY $<TARGET_FILE_DIR:cxxabi_shared>
204+
)
205+
endif ()
206206

207-
target_link_libraries(cxxabi_shared
208-
PUBLIC cxxabi_shared_objects
209-
PRIVATE ${LIBCXXABI_LIBRARIES})
207+
target_link_libraries(cxxabi_shared
208+
PUBLIC cxxabi_shared_objects
209+
PRIVATE ${LIBCXXABI_LIBRARIES})
210210

211211
if (LIBCXXABI_ENABLE_SHARED)
212-
list(APPEND LIBCXXABI_BUILD_TARGETS "cxxabi_shared")
212+
list(APPEND LIBCXXABI_BUILD_TARGETS "cxxabi_shared")
213213
endif()
214214
if (LIBCXXABI_INSTALL_SHARED_LIBRARY)
215-
list(APPEND LIBCXXABI_INSTALL_TARGETS "cxxabi_shared")
215+
list(APPEND LIBCXXABI_INSTALL_TARGETS "cxxabi_shared")
216216
endif()
217217

218-
# TODO: Move this to libc++'s HandleLibCXXABI.cmake since this is effectively trying to control
219-
# what libc++ re-exports.
220-
add_library(cxxabi-reexports INTERFACE)
221-
function(export_symbols file)
222-
# -exported_symbols_list is only available on Apple platforms
223-
if (APPLE)
224-
target_link_libraries(cxxabi_shared PRIVATE "-Wl,-exported_symbols_list,${file}")
225-
endif()
226-
endfunction()
218+
# TODO: Move this to libc++'s HandleLibCXXABI.cmake since this is effectively trying to control
219+
# what libc++ re-exports.
220+
add_library(cxxabi-reexports INTERFACE)
221+
function(export_symbols file)
222+
# -exported_symbols_list is only available on Apple platforms
223+
if (APPLE)
224+
target_link_libraries(cxxabi_shared PRIVATE "-Wl,-exported_symbols_list,${file}")
225+
endif()
226+
endfunction()
227227

228-
function(reexport_symbols file)
229-
export_symbols("${file}")
230-
# -reexported_symbols_list is only available on Apple platforms
231-
if (APPLE)
232-
target_link_libraries(cxxabi-reexports INTERFACE "-Wl,-reexported_symbols_list,${file}")
233-
endif()
234-
endfunction()
228+
function(reexport_symbols file)
229+
export_symbols("${file}")
230+
# -reexported_symbols_list is only available on Apple platforms
231+
if (APPLE)
232+
target_link_libraries(cxxabi-reexports INTERFACE "-Wl,-reexported_symbols_list,${file}")
233+
endif()
234+
endfunction()
235235

236-
export_symbols("${CMAKE_CURRENT_SOURCE_DIR}/../lib/symbols-not-reexported.exp")
237-
reexport_symbols("${CMAKE_CURRENT_SOURCE_DIR}/../lib/cxxabiv1.exp")
238-
reexport_symbols("${CMAKE_CURRENT_SOURCE_DIR}/../lib/fundamental-types.exp")
239-
reexport_symbols("${CMAKE_CURRENT_SOURCE_DIR}/../lib/itanium-base.exp")
240-
reexport_symbols("${CMAKE_CURRENT_SOURCE_DIR}/../lib/std-misc.exp")
236+
export_symbols("${CMAKE_CURRENT_SOURCE_DIR}/../lib/symbols-not-reexported.exp")
237+
reexport_symbols("${CMAKE_CURRENT_SOURCE_DIR}/../lib/cxxabiv1.exp")
238+
reexport_symbols("${CMAKE_CURRENT_SOURCE_DIR}/../lib/fundamental-types.exp")
239+
reexport_symbols("${CMAKE_CURRENT_SOURCE_DIR}/../lib/itanium-base.exp")
240+
reexport_symbols("${CMAKE_CURRENT_SOURCE_DIR}/../lib/std-misc.exp")
241241

242-
if (LIBCXXABI_ENABLE_NEW_DELETE_DEFINITIONS)
243-
reexport_symbols("${CMAKE_CURRENT_SOURCE_DIR}/../lib/new-delete.exp")
244-
endif()
242+
if (LIBCXXABI_ENABLE_NEW_DELETE_DEFINITIONS)
243+
reexport_symbols("${CMAKE_CURRENT_SOURCE_DIR}/../lib/new-delete.exp")
244+
endif()
245245

246-
# Note that std:: exception types are always defined by the library regardless of
247-
# whether the exception runtime machinery is provided.
248-
reexport_symbols("${CMAKE_CURRENT_SOURCE_DIR}/../lib/std-exceptions.exp")
246+
# Note that std:: exception types are always defined by the library regardless of
247+
# whether the exception runtime machinery is provided.
248+
reexport_symbols("${CMAKE_CURRENT_SOURCE_DIR}/../lib/std-exceptions.exp")
249249

250-
if (LIBCXXABI_ENABLE_EXCEPTIONS)
251-
reexport_symbols("${CMAKE_CURRENT_SOURCE_DIR}/../lib/itanium-exceptions.exp")
250+
if (LIBCXXABI_ENABLE_EXCEPTIONS)
251+
reexport_symbols("${CMAKE_CURRENT_SOURCE_DIR}/../lib/itanium-exceptions.exp")
252252

253-
if ("${CMAKE_OSX_ARCHITECTURES}" MATCHES "^(armv6|armv7|armv7s)$")
254-
reexport_symbols("${CMAKE_CURRENT_SOURCE_DIR}/../lib/personality-sjlj.exp")
255-
else()
256-
reexport_symbols("${CMAKE_CURRENT_SOURCE_DIR}/../lib/personality-v0.exp")
257-
endif()
253+
if ("${CMAKE_OSX_ARCHITECTURES}" MATCHES "^(armv6|armv7|armv7s)$")
254+
reexport_symbols("${CMAKE_CURRENT_SOURCE_DIR}/../lib/personality-sjlj.exp")
255+
else()
256+
reexport_symbols("${CMAKE_CURRENT_SOURCE_DIR}/../lib/personality-v0.exp")
258257
endif()
258+
endif()
259259

260260
# Build the static library.
261261
add_library(cxxabi_static_objects OBJECT EXCLUDE_FROM_ALL ${LIBCXXABI_SOURCES} ${LIBCXXABI_HEADERS})
@@ -295,19 +295,19 @@ if(LIBCXXABI_HERMETIC_STATIC_LIBRARY)
295295
_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS=)
296296
endif()
297297

298-
add_library(cxxabi_static STATIC)
299-
if (LIBCXXABI_USE_LLVM_UNWINDER AND NOT LIBCXXABI_STATICALLY_LINK_UNWINDER_IN_STATIC_LIBRARY)
300-
target_link_libraries(cxxabi_static PUBLIC unwind_static)
301-
endif()
302-
set_target_properties(cxxabi_static
303-
PROPERTIES
304-
EXCLUDE_FROM_ALL "$<IF:$<BOOL:${LIBCXXABI_ENABLE_STATIC}>,FALSE,TRUE>"
305-
LINK_FLAGS "${LIBCXXABI_LINK_FLAGS}"
306-
OUTPUT_NAME "${LIBCXXABI_STATIC_OUTPUT_NAME}"
307-
)
308-
target_link_libraries(cxxabi_static
309-
PUBLIC cxxabi_static_objects
310-
PRIVATE ${LIBCXXABI_STATIC_LIBRARIES} ${LIBCXXABI_LIBRARIES})
298+
add_library(cxxabi_static STATIC)
299+
if (LIBCXXABI_USE_LLVM_UNWINDER AND NOT LIBCXXABI_STATICALLY_LINK_UNWINDER_IN_STATIC_LIBRARY)
300+
target_link_libraries(cxxabi_static PUBLIC unwind_static)
301+
endif()
302+
set_target_properties(cxxabi_static
303+
PROPERTIES
304+
EXCLUDE_FROM_ALL "$<IF:$<BOOL:${LIBCXXABI_ENABLE_STATIC}>,FALSE,TRUE>"
305+
LINK_FLAGS "${LIBCXXABI_LINK_FLAGS}"
306+
OUTPUT_NAME "${LIBCXXABI_STATIC_OUTPUT_NAME}"
307+
)
308+
target_link_libraries(cxxabi_static
309+
PUBLIC cxxabi_static_objects
310+
PRIVATE ${LIBCXXABI_STATIC_LIBRARIES} ${LIBCXXABI_LIBRARIES})
311311

312312
if (LIBCXXABI_ENABLE_STATIC)
313313
list(APPEND LIBCXXABI_BUILD_TARGETS "cxxabi_static")

0 commit comments

Comments
 (0)