diff --git a/CMake/Modules/FindDl.cmake b/CMake/Modules/FindDl.cmake deleted file mode 100644 index 5040f1e46d..0000000000 --- a/CMake/Modules/FindDl.cmake +++ /dev/null @@ -1,18 +0,0 @@ -# Stick to traditional approaches here. The following are defined. - -# DL_FOUND - The system has the dl library. DL_INCLUDE_DIR - The dl include -# directory. DL_LIBRARIES - The library file to link to. - -if(DL_INCLUDE_DIR AND DL_LIBRARIES) - # Already in cache, so don't repeat the finding procedures. - set(DL_FIND_QUIETLY TRUE) -endif() - -find_path(DL_INCLUDE_DIR dlfcn.h PATHS /usr/local/include /usr/include) - -find_library(DL_LIBRARIES dl PATHS /usr/local/lib /usr/lib /lib) - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(DL DEFAULT_MSG DL_LIBRARIES DL_INCLUDE_DIR) - -mark_as_advanced(DL_INCLUDE_DIR DL_LIBRARIES) diff --git a/StepmaniaCore.cmake b/StepmaniaCore.cmake index b6b7a69f23..1265c26058 100644 --- a/StepmaniaCore.cmake +++ b/StepmaniaCore.cmake @@ -324,8 +324,6 @@ elseif(LINUX) set(HAS_X11 TRUE) endif() - find_package(Dl) - set(HAS_XRANDR FALSE) if(WITH_XRANDR) find_package(Xrandr REQUIRED) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 09fbaadeaf..39c9df0772 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -256,14 +256,9 @@ else() # Linux BACKTRACE_METHOD_TEXT="no backtrace") endif() target_compile_definitions("${SM_EXE_NAME}" PRIVATE - BACKTRACE_LOOKUP_METHOD_TEXT="backtrace_symbols") - if(${DL_FOUND}) - target_compile_definitions("${SM_EXE_NAME}" PRIVATE - BACKTRACE_LOOKUP_METHOD_DLADDR) - else() - target_compile_definitions("${SM_EXE_NAME}" PRIVATE - BACKTRACE_LOOKUP_METHOD_BACKTRACE_SYMBOLS) - endif() + BACKTRACE_LOOKUP_METHOD_TEXT="dladdr") + target_compile_definitions("${SM_EXE_NAME}" PRIVATE + BACKTRACE_LOOKUP_METHOD_DLADDR) endif() endif() if(${HAS_PTHREAD}) @@ -389,13 +384,9 @@ else() # Unix / Linux TODO: Remember to find and locate the zip archive files. "${SM_FFMPEG_LIB}/libavutil.a") list(REMOVE_ITEM SMDATA_LINK_LIB "zlib") - list(APPEND SMDATA_LINK_LIB "zlib" ${VA_LIBRARY} ${VA_DRM_LIBRARY}) - - if(${DL_FOUND}) - list(APPEND SMDATA_LINK_LIB ${DL_LIBRARIES}) - endif() - - list(APPEND SMDATA_LINK_LIB "${OPENGL_LIBRARY}") + list(APPEND SMDATA_LINK_LIB "zlib" + ${CMAKE_DL_LIBS} + "${OPENGL_LIBRARY}") if(GTK3_FOUND) list(APPEND SMDATA_LINK_LIB "${GTK3_LIBRARIES}") @@ -453,9 +444,6 @@ else() if(X11_FOUND) list(APPEND SM_INCLUDE_DIRS "${X11_INCLUDE_DIR}") endif() - if(DL_FOUND) - list(APPEND SM_INCLUDE_DIRS "${DL_INCLUDE_DIR}") - endif() endif() endif()