@@ -326,16 +326,17 @@ if (WITH_BLKIN)
326326endif (WITH_BLKIN)
327327
328328## breakpad
329- set (breakpad_SOURCE_DIR ${CMAKE_SOURCE_DIR} /src/breakpad)
330- set (lss_SOURCE_DIR ${CMAKE_SOURCE_DIR} /src/lss)
329+ if (WITH_BREAKPAD)
330+ set (breakpad_SOURCE_DIR ${CMAKE_SOURCE_DIR} /src/breakpad)
331+ set (lss_SOURCE_DIR ${CMAKE_SOURCE_DIR} /src/lss)
331332
332- add_custom_target (breakpad_lss_symlink)
333- add_custom_command (
333+ add_custom_target (breakpad_lss_symlink)
334+ add_custom_command (
334335 TARGET breakpad_lss_symlink
335336 COMMAND ${CMAKE_COMMAND} -E create_symlink ${lss_SOURCE_DIR} ${breakpad_SOURCE_DIR} /src/third_party/lss
336337 COMMENT "Creating symbolic link lss -> breakpad third party"
337- )
338- ExternalProject_Add(
338+ )
339+ ExternalProject_Add(
339340 breakpad_project
340341 SOURCE_DIR "${breakpad_SOURCE_DIR} "
341342 CONFIGURE_COMMAND
@@ -347,20 +348,20 @@ ExternalProject_Add(
347348 BUILD_IN_SOURCE ON
348349 DEPENDS breakpad_lss_symlink
349350 BUILD_BYPRODUCTS "${breakpad_SOURCE_DIR} /src/libbreakpad.a;${breakpad_SOURCE_DIR} /src/client/linux/libbreakpad_client.a"
350- )
351-
352- add_library (libbreakpad STATIC IMPORTED GLOBAL )
353- set_property (TARGET libbreakpad PROPERTY IMPORTED_LOCATION ${breakpad_SOURCE_DIR} /src/libbreakpad.a)
354- add_library (libbreakpad_client STATIC IMPORTED GLOBAL )
355- set_property (TARGET libbreakpad_client PROPERTY IMPORTED_LOCATION ${breakpad_SOURCE_DIR} /src/client/linux/libbreakpad_client.a)
351+ )
356352
357- include_directories (SYSTEM "${breakpad_SOURCE_DIR} /src" )
358- add_dependencies (libbreakpad breakpad_project)
359- add_dependencies (libbreakpad_client breakpad_project)
353+ add_library (libbreakpad STATIC IMPORTED GLOBAL )
354+ set_property (TARGET libbreakpad PROPERTY IMPORTED_LOCATION ${breakpad_SOURCE_DIR} /src/libbreakpad.a)
355+ add_library (libbreakpad_client STATIC IMPORTED GLOBAL )
356+ set_property (TARGET libbreakpad_client PROPERTY IMPORTED_LOCATION ${breakpad_SOURCE_DIR} /src/client/linux/libbreakpad_client.a)
360357
361- add_library (breakpad INTERFACE )
362- target_link_libraries (breakpad INTERFACE libbreakpad libbreakpad_client)
358+ include_directories (SYSTEM "${breakpad_SOURCE_DIR} /src" )
359+ add_dependencies (libbreakpad breakpad_project)
360+ add_dependencies (libbreakpad_client breakpad_project)
363361
362+ add_library (breakpad INTERFACE )
363+ target_link_libraries (breakpad INTERFACE libbreakpad libbreakpad_client)
364+ endif (WITH_BREAKPAD)
364365
365366if (WITH_JAEGER)
366367 find_package (thrift 0.13.0 REQUIRED)
@@ -518,8 +519,10 @@ if(WITH_JAEGER)
518519 target_link_libraries (common-objs jaeger_base)
519520endif ()
520521
521- add_dependencies (common-objs breakpad_project)
522- target_link_libraries (common-objs breakpad)
522+ if (WITH_BREAKPAD)
523+ add_dependencies (common-objs breakpad_project)
524+ target_link_libraries (common-objs breakpad)
525+ endif ()
523526
524527CHECK_C_COMPILER_FLAG("-fvar-tracking-assignments" HAS_VTA)
525528add_subdirectory (auth)
@@ -582,7 +585,9 @@ if(WITH_JAEGER)
582585 list (APPEND ceph_common_deps jaeger_base)
583586endif ()
584587
585- list (APPEND ceph_common_deps breakpad)
588+ if (WITH_BREAKPAD)
589+ list (APPEND ceph_common_deps breakpad)
590+ endif ()
586591
587592if (WIN32 )
588593 list (APPEND ceph_common_deps ws2_32 mswsock iphlpapi bcrypt)
@@ -620,7 +625,9 @@ if(WITH_JAEGER)
620625add_dependencies (common jaeger_base)
621626endif ()
622627
628+ if (WITH_BREAKPAD)
623629add_dependencies (common breakpad_project)
630+ endif ()
624631
625632if (WIN32 )
626633 # Statically building ceph-common on Windows fails. We're temporarily
@@ -641,7 +648,9 @@ if(WITH_JAEGER)
641648add_dependencies (ceph-common jaeger_base)
642649endif ()
643650
651+ if (WITH_BREAKPAD)
644652add_dependencies (ceph-common breakpad_project)
653+ endif ()
645654
646655# appease dpkg-shlibdeps
647656set_target_properties (ceph-common PROPERTIES
0 commit comments