diff --git a/external/auto_updates/xz/CMakeLists.txt b/external/auto_updates/xz/CMakeLists.txt index 8631a5d..b827185 100644 --- a/external/auto_updates/xz/CMakeLists.txt +++ b/external/auto_updates/xz/CMakeLists.txt @@ -24,9 +24,4 @@ else() INTERFACE lzma ) - - target_link_libraries(external_xz - INTERFACE - ${CMAKE_DL_LIBS} - ) endif() diff --git a/external/dispatch/CMakeLists.txt b/external/dispatch/CMakeLists.txt index 27b9d02..b6bba91 100644 --- a/external/dispatch/CMakeLists.txt +++ b/external/dispatch/CMakeLists.txt @@ -61,7 +61,6 @@ INTERFACE target_link_libraries(external_dispatch_bundled INTERFACE ${dispatch_binary_dir}/src/BlocksRuntime/libBlocksRuntime.a - pthread ) target_link_libraries(external_dispatch diff --git a/external/ffmpeg/CMakeLists.txt b/external/ffmpeg/CMakeLists.txt index 50acdd4..394ac61 100644 --- a/external/ffmpeg/CMakeLists.txt +++ b/external/ffmpeg/CMakeLists.txt @@ -57,7 +57,6 @@ else() target_link_libraries(external_ffmpeg INTERFACE X11 - pthread ) endif() endif() diff --git a/external/hime_qt/hime_im_client/CMakeLists.txt b/external/hime_qt/hime_im_client/CMakeLists.txt index 5392daa..fd4f0b7 100644 --- a/external/hime_qt/hime_im_client/CMakeLists.txt +++ b/external/hime_qt/hime_im_client/CMakeLists.txt @@ -32,9 +32,4 @@ else() PRIVATE ${X11_INCLUDE_DIRS} ) - - target_link_libraries(external_hime_im_client - PRIVATE - ${CMAKE_DL_LIBS} - ) endif() diff --git a/external/jemalloc/CMakeLists.txt b/external/jemalloc/CMakeLists.txt index 72537cd..0121b09 100644 --- a/external/jemalloc/CMakeLists.txt +++ b/external/jemalloc/CMakeLists.txt @@ -51,12 +51,6 @@ INTERFACE ${SOURCE_DIR}/include ) -target_link_libraries(external_jemalloc_bundled -INTERFACE - ${CMAKE_DL_LIBS} - pthread -) - add_dependencies(external_jemalloc_bundled jemalloc-build) target_link_libraries(external_jemalloc diff --git a/external/nimf_qt5/CMakeLists.txt b/external/nimf_qt5/CMakeLists.txt index 2f2e55b..7c4d569 100644 --- a/external/nimf_qt5/CMakeLists.txt +++ b/external/nimf_qt5/CMakeLists.txt @@ -45,6 +45,5 @@ else() target_link_libraries(external_nimf_qt5 PRIVATE desktop-app::external_qt - ${CMAKE_DL_LIBS} ) endif() diff --git a/external/openal/CMakeLists.txt b/external/openal/CMakeLists.txt index f97013a..cd3eedf 100644 --- a/external/openal/CMakeLists.txt +++ b/external/openal/CMakeLists.txt @@ -47,11 +47,6 @@ else() INTERFACE openal ) - target_link_libraries(external_openal - INTERFACE - ${CMAKE_DL_LIBS} - pthread - ) endif() if (NOT DESKTOP_APP_USE_PACKAGED) diff --git a/external/openssl/openssl_common/CMakeLists.txt b/external/openssl/openssl_common/CMakeLists.txt index 3caa6fb..07548fa 100644 --- a/external/openssl/openssl_common/CMakeLists.txt +++ b/external/openssl/openssl_common/CMakeLists.txt @@ -19,12 +19,4 @@ if (NOT DESKTOP_APP_USE_PACKAGED) ${libs_loc}/openssl/include ) endif() - - if (LINUX) - target_link_libraries(external_openssl_common - INTERFACE - ${CMAKE_DL_LIBS} - pthread - ) - endif() endif() diff --git a/external/qt/CMakeLists.txt b/external/qt/CMakeLists.txt index 23b59ba..172b66b 100644 --- a/external/qt/CMakeLists.txt +++ b/external/qt/CMakeLists.txt @@ -305,8 +305,6 @@ else() xcb X11 X11-xcb - ${CMAKE_DL_LIBS} - pthread ) endif() endif() diff --git a/external/qt/qt6/CMakeLists.txt b/external/qt/qt6/CMakeLists.txt index 798e204..b39bef7 100644 --- a/external/qt/qt6/CMakeLists.txt +++ b/external/qt/qt6/CMakeLists.txt @@ -280,8 +280,6 @@ else() xcb X11 X11-xcb - ${CMAKE_DL_LIBS} - pthread ) endif() endif() diff --git a/external/rlottie/CMakeLists.txt b/external/rlottie/CMakeLists.txt index dd87a7d..ab18554 100644 --- a/external/rlottie/CMakeLists.txt +++ b/external/rlottie/CMakeLists.txt @@ -133,13 +133,6 @@ else() ${rlottie_loc}/src/vector/freetype ) - if (LINUX) - target_link_libraries(external_rlottie_bundled - PRIVATE - pthread - ) - endif() - if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") target_compile_options(external_rlottie_bundled PRIVATE diff --git a/linux_wayland_helper/CMakeLists.txt b/linux_wayland_helper/CMakeLists.txt index 02205ba..8c8e281 100644 --- a/linux_wayland_helper/CMakeLists.txt +++ b/linux_wayland_helper/CMakeLists.txt @@ -16,5 +16,4 @@ PRIVATE target_link_libraries(linux_wayland_helper PUBLIC desktop-app::external_gsl - ${CMAKE_DL_LIBS} ) diff --git a/linux_xcb_helper/CMakeLists.txt b/linux_xcb_helper/CMakeLists.txt index f1f46c2..8344d6b 100644 --- a/linux_xcb_helper/CMakeLists.txt +++ b/linux_xcb_helper/CMakeLists.txt @@ -12,8 +12,3 @@ nice_target_sources(linux_xcb_helper ${CMAKE_CURRENT_SOURCE_DIR} PRIVATE linux_xcb_helper.cpp ) - -target_link_libraries(linux_xcb_helper -PUBLIC - ${CMAKE_DL_LIBS} -) diff --git a/options_linux.cmake b/options_linux.cmake index 241ce37..d60af4f 100644 --- a/options_linux.cmake +++ b/options_linux.cmake @@ -28,6 +28,7 @@ INTERFACE target_link_options(common_options INTERFACE -Wl,--as-needed + -pthread ) if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") @@ -64,6 +65,7 @@ endif() target_link_libraries(common_options INTERFACE desktop-app::external_jemalloc + ${CMAKE_DL_LIBS} ) if (DESKTOP_APP_USE_ALLOCATION_TRACER) @@ -109,7 +111,6 @@ if (NOT DESKTOP_APP_USE_PACKAGED) endif() target_link_options(common_options INTERFACE - -pthread -rdynamic -fwhole-program -Wl,-z,relro @@ -117,16 +118,3 @@ if (NOT DESKTOP_APP_USE_PACKAGED) # -pie # https://gitlab.gnome.org/GNOME/nautilus/-/issues/1601 ) endif() - -if (DESKTOP_APP_USE_PACKAGED) - find_library(ATOMIC_LIBRARY atomic) -else() - find_library(ATOMIC_LIBRARY libatomic.a) -endif() - -if (ATOMIC_LIBRARY) - target_link_libraries(common_options - INTERFACE - ${ATOMIC_LIBRARY} - ) -endif()